summaryrefslogtreecommitdiffstats
path: root/core/jni/android_opengl_GLES11.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/jni/android_opengl_GLES11.cpp')
-rw-r--r--core/jni/android_opengl_GLES11.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/core/jni/android_opengl_GLES11.cpp b/core/jni/android_opengl_GLES11.cpp
index 352f5bf..9f00b01 100644
--- a/core/jni/android_opengl_GLES11.cpp
+++ b/core/jni/android_opengl_GLES11.cpp
@@ -63,6 +63,12 @@ static void glVertexAttribPointerBounds(GLuint indx, GLint size, GLenum type,
glVertexAttribPointer(indx, size, type, normalized, stride, pointer);
}
#endif
+#ifdef GL_ES_VERSION_3_0
+static void glVertexAttribIPointerBounds(GLuint indx, GLint size, GLenum type,
+ GLsizei stride, const GLvoid *pointer, GLsizei count) {
+ glVertexAttribIPointer(indx, size, type, stride, pointer);
+}
+#endif
}
/* Cache method IDs each time the class is loaded. */
@@ -571,7 +577,7 @@ android_glColorPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
- (const GLvoid *)offset
+ (GLvoid *)offset
);
}
@@ -672,7 +678,7 @@ android_glDrawElements__IIII
(GLenum)mode,
(GLsizei)count,
(GLenum)type,
- (const GLvoid *)offset
+ (GLvoid *)offset
);
if (_exception) {
jniThrowException(_env, _exceptionType, _exceptionMessage);
@@ -2263,7 +2269,7 @@ android_glIsBuffer__I
_returnValue = glIsBuffer(
(GLuint)buffer
);
- return _returnValue;
+ return (jboolean)_returnValue;
}
/* GLboolean glIsEnabled ( GLenum cap ) */
@@ -2274,7 +2280,7 @@ android_glIsEnabled__I
_returnValue = glIsEnabled(
(GLenum)cap
);
- return _returnValue;
+ return (jboolean)_returnValue;
}
/* GLboolean glIsTexture ( GLuint texture ) */
@@ -2285,7 +2291,7 @@ android_glIsTexture__I
_returnValue = glIsTexture(
(GLuint)texture
);
- return _returnValue;
+ return (jboolean)_returnValue;
}
/* void glNormalPointer ( GLenum type, GLsizei stride, GLint offset ) */
@@ -2295,7 +2301,7 @@ android_glNormalPointer__III
glNormalPointer(
(GLenum)type,
(GLsizei)stride,
- (const GLvoid *)offset
+ (GLvoid *)offset
);
}
@@ -2522,7 +2528,7 @@ android_glTexCoordPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
- (const GLvoid *)offset
+ (GLvoid *)offset
);
}
@@ -2930,7 +2936,7 @@ android_glVertexPointer__IIII
(GLint)size,
(GLenum)type,
(GLsizei)stride,
- (const GLvoid *)offset
+ (GLvoid *)offset
);
}