diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-06 20:41:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-06 20:41:34 -0800 |
| commit | 5e530e02bc3073a2e2469df3c333ae14f1b37433 (patch) | |
| tree | ce90daccf0b729c329acf5f193505da2be275d29 /opengl/libs/GLES2 | |
| parent | e2d4cc28d72db0d49e61ed4ceeb878436cafb23a (diff) | |
| parent | a151a19db2fa07295837027fb5d84c02401cc78d (diff) | |
| download | frameworks_native-5e530e02bc3073a2e2469df3c333ae14f1b37433.zip frameworks_native-5e530e02bc3073a2e2469df3c333ae14f1b37433.tar.gz frameworks_native-5e530e02bc3073a2e2469df3c333ae14f1b37433.tar.bz2 | |
am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
Fix return type of glGetAttribLocation and glGetUniformLocation
Diffstat (limited to 'opengl/libs/GLES2')
| -rw-r--r-- | opengl/libs/GLES2/gl2_api.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/GLES2/gl2_api.in b/opengl/libs/GLES2/gl2_api.in index 9a89a52..cccf46c 100644 --- a/opengl/libs/GLES2/gl2_api.in +++ b/opengl/libs/GLES2/gl2_api.in @@ -169,7 +169,7 @@ void API_ENTRY(glGetActiveUniform)(GLuint program, GLuint index, GLsizei bufsize void API_ENTRY(glGetAttachedShaders)(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) { CALL_GL_API(glGetAttachedShaders, program, maxcount, count, shaders); } -int API_ENTRY(glGetAttribLocation)(GLuint program, const GLchar* name) { +GLint API_ENTRY(glGetAttribLocation)(GLuint program, const GLchar* name) { CALL_GL_API_RETURN(glGetAttribLocation, program, name); } void API_ENTRY(glGetBooleanv)(GLenum pname, GLboolean* params) { @@ -226,7 +226,7 @@ void API_ENTRY(glGetUniformfv)(GLuint program, GLint location, GLfloat* params) void API_ENTRY(glGetUniformiv)(GLuint program, GLint location, GLint* params) { CALL_GL_API(glGetUniformiv, program, location, params); } -int API_ENTRY(glGetUniformLocation)(GLuint program, const GLchar* name) { +GLint API_ENTRY(glGetUniformLocation)(GLuint program, const GLchar* name) { CALL_GL_API_RETURN(glGetUniformLocation, program, name); } void API_ENTRY(glGetVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params) { |