diff options
Diffstat (limited to 'opengl/java/android')
-rw-r--r-- | opengl/java/android/opengl/GLES10.java | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/opengl/java/android/opengl/GLES10.java b/opengl/java/android/opengl/GLES10.java index 147b60f5fac1..db52b821eee6 100644 --- a/opengl/java/android/opengl/GLES10.java +++ b/opengl/java/android/opengl/GLES10.java @@ -395,13 +395,6 @@ public class GLES10 { int stride, java.nio.Buffer pointer ) { - if ((size == 4) && - ((type == GL_FLOAT) || - (type == GL_UNSIGNED_BYTE) || - (type == GL_FIXED)) && - (stride >= 0)) { - _colorPointer = pointer; - } glColorPointerBounds( size, type, @@ -409,6 +402,13 @@ public class GLES10 { pointer, pointer.remaining() ); + if ((size == 4) && + ((type == GL_FLOAT) || + (type == GL_UNSIGNED_BYTE) || + (type == GL_FIXED)) && + (stride >= 0)) { + _colorPointer = pointer; + } } // C function void glCompressedTexImage2D ( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data ) @@ -956,6 +956,12 @@ public class GLES10 { int stride, java.nio.Buffer pointer ) { + glNormalPointerBounds( + type, + stride, + pointer, + pointer.remaining() + ); if (((type == GL_FLOAT) || (type == GL_BYTE) || (type == GL_SHORT) || @@ -963,12 +969,6 @@ public class GLES10 { (stride >= 0)) { _normalPointer = pointer; } - glNormalPointerBounds( - type, - stride, - pointer, - pointer.remaining() - ); } // C function void glOrthof ( GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar ) @@ -1149,6 +1149,13 @@ public class GLES10 { int stride, java.nio.Buffer pointer ) { + glTexCoordPointerBounds( + size, + type, + stride, + pointer, + pointer.remaining() + ); if (((size == 2) || (size == 3) || (size == 4)) && @@ -1159,13 +1166,6 @@ public class GLES10 { (stride >= 0)) { _texCoordPointer = pointer; } - glTexCoordPointerBounds( - size, - type, - stride, - pointer, - pointer.remaining() - ); } // C function void glTexEnvf ( GLenum target, GLenum pname, GLfloat param ) @@ -1294,6 +1294,13 @@ public class GLES10 { int stride, java.nio.Buffer pointer ) { + glVertexPointerBounds( + size, + type, + stride, + pointer, + pointer.remaining() + ); if (((size == 2) || (size == 3) || (size == 4)) && @@ -1304,13 +1311,6 @@ public class GLES10 { (stride >= 0)) { _vertexPointer = pointer; } - glVertexPointerBounds( - size, - type, - stride, - pointer, - pointer.remaining() - ); } // C function void glViewport ( GLint x, GLint y, GLsizei width, GLsizei height ) |