diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-06 13:42:48 -0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-06 14:39:08 -0800 |
| commit | 300ad09822db1013d9f28c4bca3680f865533ab6 (patch) | |
| tree | b8375a9ed175fc6625d85c9c586980292d3f0ab4 /opengl/include | |
| parent | 7abbbc680d03dd8e50a709f89b78ace6b81154b0 (diff) | |
| download | frameworks_native-300ad09822db1013d9f28c4bca3680f865533ab6.zip frameworks_native-300ad09822db1013d9f28c4bca3680f865533ab6.tar.gz frameworks_native-300ad09822db1013d9f28c4bca3680f865533ab6.tar.bz2 | |
Fix return type of glGetAttribLocation and glGetUniformLocation
from int to GLint.
See:
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml
Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
Diffstat (limited to 'opengl/include')
| -rw-r--r-- | opengl/include/GLES2/gl2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/include/GLES2/gl2.h b/opengl/include/GLES2/gl2.h index e1d3b87..c139c25 100644 --- a/opengl/include/GLES2/gl2.h +++ b/opengl/include/GLES2/gl2.h @@ -528,7 +528,7 @@ GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); +GL_APICALL GLint GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params); GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); GL_APICALL GLenum GL_APIENTRY glGetError (void); @@ -547,7 +547,7 @@ GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params); GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params); GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params); -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); +GL_APICALL GLint GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params); GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params); GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer); |