android/ndk-samples
1
0
Fork 0
mirror of https://github.com/android/ndk-samples synced 2025-11-10 02:21:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

merge into: android:master
Branches Tags
android:main android:master android:develop android:documentation android:master-ndkbuild android:master-obsolete android:android-mk
...
pull from: android:android-mk
Branches Tags
android:main android:master android:develop android:documentation android:master-ndkbuild android:master-obsolete android:android-mk

2 Commits
master ... android-mk

Author SHA1 Message Date
Gerry
485f2b9d19 Merge pull request #489 from googlesamples/mk-fix-37001153 
Fix gles3jni bug b/37001153 ( dated 2014 ) in branch android-mk
 2018-02-01 15:27:44 -08:00
guanghuafan
0e88bb1c3e Fix gles3jni bug b/37001153 ( dated 2014 ) in branch android-mk 2018-02-01 14:39:58 -08:00
3 changed files with 3 additions and 2 deletions
Expand all files Collapse all files

2
gles3jni/jni/RendererES2.cpp
View File

@@ -129,7 +129,7 @@ void RendererES2::draw(unsigned int numInstances) {
glUseProgram(mProgram); glUseProgram(mProgram);
glBindBuffer(GL_ARRAY_BUFFER, mVB); glBindBuffer(GL_ARRAY_BUFFER, mVB);
glVertexAttribPointer(mPosAttrib, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, pos)); glVertexAttribPointer(mPosAttrib, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, pos));
glVertexAttribPointer(mColorAttrib, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, rgba)); glVertexAttribPointer(mColorAttrib, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, rgba));
glEnableVertexAttribArray(mPosAttrib); glEnableVertexAttribArray(mPosAttrib);
glEnableVertexAttribArray(mColorAttrib); glEnableVertexAttribArray(mColorAttrib);

2
gles3jni/jni/RendererES3.cpp
View File

@@ -103,7 +103,7 @@ bool RendererES3::init() {
glBindVertexArray(mVBState); glBindVertexArray(mVBState);
glBindBuffer(GL_ARRAY_BUFFER, mVB[VB_INSTANCE]); glBindBuffer(GL_ARRAY_BUFFER, mVB[VB_INSTANCE]);
glVertexAttribPointer(POS_ATTRIB, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, pos)); glVertexAttribPointer(POS_ATTRIB, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, pos));
glVertexAttribPointer(COLOR_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, rgba)); glVertexAttribPointer(COLOR_ATTRIB, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Vertex), (const GLvoid*)offsetof(Vertex, rgba));
glEnableVertexAttribArray(POS_ATTRIB); glEnableVertexAttribArray(POS_ATTRIB);
glEnableVertexAttribArray(COLOR_ATTRIB); glEnableVertexAttribArray(COLOR_ATTRIB);

1
gles3jni/jni/gles3jni.cpp
View File

@@ -17,6 +17,7 @@
#include <jni.h> #include <jni.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <string.h>
#include "gles3jni.h" #include "gles3jni.h"