diff options
| author | 2012-11-06 20:16:14 -0800 | |
|---|---|---|
| committer | 2012-11-06 20:16:14 -0800 | |
| commit | a151a19db2fa07295837027fb5d84c02401cc78d (patch) | |
| tree | b8375a9ed175fc6625d85c9c586980292d3f0ab4 /opengl/libs/entries.in | |
| parent | 7abbbc680d03dd8e50a709f89b78ace6b81154b0 (diff) | |
| parent | 300ad09822db1013d9f28c4bca3680f865533ab6 (diff) | |
Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
Diffstat (limited to 'opengl/libs/entries.in')
| -rw-r--r-- | opengl/libs/entries.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/entries.in b/opengl/libs/entries.in index 6316d78983..b9a51a49c1 100644 --- a/opengl/libs/entries.in +++ b/opengl/libs/entries.in @@ -160,7 +160,7 @@ GL_ENTRY(void, glGenerateMipmapOES, GLenum target) GL_ENTRY(void, glGetActiveAttrib, GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name) GL_ENTRY(void, glGetActiveUniform, GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name) GL_ENTRY(void, glGetAttachedShaders, GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) -GL_ENTRY(int, glGetAttribLocation, GLuint program, const GLchar* name) +GL_ENTRY(GLint, glGetAttribLocation, GLuint program, const GLchar* name) GL_ENTRY(void, glGetBooleanv, GLenum pname, GLboolean *params) GL_ENTRY(void, glGetBufferParameteriv, GLenum target, GLenum pname, GLint *params) GL_ENTRY(void, glGetBufferPointervOES, GLenum target, GLenum pname, GLvoid ** params) @@ -218,7 +218,7 @@ GL_ENTRY(void, glGetTexParameterfv, GLenum target, GLenum pname, GLfloat *params GL_ENTRY(void, glGetTexParameteriv, GLenum target, GLenum pname, GLint *params) GL_ENTRY(void, glGetTexParameterxv, GLenum target, GLenum pname, GLfixed *params) GL_ENTRY(void, glGetTexParameterxvOES, GLenum target, GLenum pname, GLfixed *params) -GL_ENTRY(int, glGetUniformLocation, GLuint program, const GLchar* name) +GL_ENTRY(GLint, glGetUniformLocation, GLuint program, const GLchar* name) GL_ENTRY(void, glGetUniformfv, GLuint program, GLint location, GLfloat* params) GL_ENTRY(void, glGetUniformiv, GLuint program, GLint location, GLint* params) GL_ENTRY(void, glGetVertexAttribPointerv, GLuint index, GLenum pname, GLvoid** pointer) |