KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: s/GLhandleARB/GLuint/ for glGetUniform functions 

The GL specs say the parameter is GLuint, not GLhandleARB.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Brian Paul 2014-03-08 18:06:30 -07:00
parent a19b19fb94
commit d96ed5c088
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mapi/glapi/gen/ARB_robustness.xml
View File

@ -152,28 +152,28 @@
<!-- OpenGL 2.0 sized buffer queries --> <!-- OpenGL 2.0 sized buffer queries -->
<function name="GetnUniformfvARB" offset="assign"> <function name="GetnUniformfvARB" offset="assign">
<param name="program" type="GLhandleARB"/> <param name="program" type="GLuint"/>
<param name="location" type="GLint"/> <param name="location" type="GLint"/>
<param name="bufSize" type="GLsizei"/> <param name="bufSize" type="GLsizei"/>
<param name="params" type="GLfloat *" output="true"/> <param name="params" type="GLfloat *" output="true"/>
</function> </function>
<function name="GetnUniformivARB" offset="assign"> <function name="GetnUniformivARB" offset="assign">
<param name="program" type="GLhandleARB"/> <param name="program" type="GLuint"/>
<param name="location" type="GLint"/> <param name="location" type="GLint"/>
<param name="bufSize" type="GLsizei"/> <param name="bufSize" type="GLsizei"/>
<param name="params" type="GLint *" output="true"/> <param name="params" type="GLint *" output="true"/>
</function> </function>
<function name="GetnUniformuivARB" offset="assign"> <function name="GetnUniformuivARB" offset="assign">
<param name="program" type="GLhandleARB"/> <param name="program" type="GLuint"/>
<param name="location" type="GLint"/> <param name="location" type="GLint"/>
<param name="bufSize" type="GLsizei"/> <param name="bufSize" type="GLsizei"/>
<param name="params" type="GLuint *" output="true"/> <param name="params" type="GLuint *" output="true"/>
</function> </function>
<function name="GetnUniformdvARB" offset="assign"> <function name="GetnUniformdvARB" offset="assign">
<param name="program" type="GLhandleARB"/> <param name="program" type="GLuint"/>
<param name="location" type="GLint"/> <param name="location" type="GLint"/>
<param name="bufSize" type="GLsizei"/> <param name="bufSize" type="GLsizei"/>
<param name="params" type="GLdouble *" output="true"/> <param name="params" type="GLdouble *" output="true"/>

6
src/mesa/main/uniform_query.cpp
View File

@ -40,9 +40,9 @@
extern "C" void GLAPIENTRY extern "C" void GLAPIENTRY
_mesa_GetActiveUniform(GLhandleARB program, GLuint index, _mesa_GetActiveUniform(GLuint program, GLuint index,
GLsizei maxLength, GLsizei *length, GLint *size, GLsizei maxLength, GLsizei *length, GLint *size,
GLenum *type, GLcharARB *nameOut) GLenum *type, GLcharARB *nameOut)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *shProg = struct gl_shader_program *shProg =

20
src/mesa/main/uniforms.c
View File

@ -822,7 +822,7 @@ _mesa_ProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count,
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformfvARB(GLhandleARB program, GLint location, _mesa_GetnUniformfvARB(GLuint program, GLint location,
GLsizei bufSize, GLfloat *params) GLsizei bufSize, GLfloat *params)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
@ -830,14 +830,14 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location,
} }
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformfv(GLhandleARB program, GLint location, GLfloat *params) _mesa_GetUniformfv(GLuint program, GLint location, GLfloat *params)
{ {
_mesa_GetnUniformfvARB(program, location, INT_MAX, params); _mesa_GetnUniformfvARB(program, location, INT_MAX, params);
} }
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformivARB(GLhandleARB program, GLint location, _mesa_GetnUniformivARB(GLuint program, GLint location,
GLsizei bufSize, GLint *params) GLsizei bufSize, GLint *params)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
@ -845,7 +845,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location,
} }
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params) _mesa_GetUniformiv(GLuint program, GLint location, GLint *params)
{ {
_mesa_GetnUniformivARB(program, location, INT_MAX, params); _mesa_GetnUniformivARB(program, location, INT_MAX, params);
} }
@ -853,7 +853,7 @@ _mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params)
/* GL3 */ /* GL3 */
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformuivARB(GLhandleARB program, GLint location, _mesa_GetnUniformuivARB(GLuint program, GLint location,
GLsizei bufSize, GLuint *params) GLsizei bufSize, GLuint *params)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
@ -861,7 +861,7 @@ _mesa_GetnUniformuivARB(GLhandleARB program, GLint location,
} }
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params) _mesa_GetUniformuiv(GLuint program, GLint location, GLuint *params)
{ {
_mesa_GetnUniformuivARB(program, location, INT_MAX, params); _mesa_GetnUniformuivARB(program, location, INT_MAX, params);
} }
@ -869,8 +869,8 @@ _mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params)
/* GL4 */ /* GL4 */
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformdvARB(GLhandleARB program, GLint location, _mesa_GetnUniformdvARB(GLuint program, GLint location,
GLsizei bufSize, GLdouble *params) GLsizei bufSize, GLdouble *params)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
@ -887,14 +887,14 @@ _mesa_GetnUniformdvARB(GLhandleARB program, GLint location,
} }
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformdv(GLhandleARB program, GLint location, GLdouble *params) _mesa_GetUniformdv(GLuint program, GLint location, GLdouble *params)
{ {
_mesa_GetnUniformdvARB(program, location, INT_MAX, params); _mesa_GetnUniformdvARB(program, location, INT_MAX, params);
} }
GLint GLAPIENTRY GLint GLAPIENTRY
_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name) _mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name)
{ {
struct gl_shader_program *shProg; struct gl_shader_program *shProg;
GLuint index, offset; GLuint index, offset;

24
src/mesa/main/uniforms.h
View File

@ -195,23 +195,23 @@ _mesa_ProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count,
GLboolean transpose, const GLfloat *value); GLboolean transpose, const GLfloat *value);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); _mesa_GetnUniformfvARB(GLuint, GLint, GLsizei, GLfloat *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *); _mesa_GetUniformfv(GLuint, GLint, GLfloat *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); _mesa_GetnUniformivARB(GLuint, GLint, GLsizei, GLint *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *); _mesa_GetUniformuiv(GLuint, GLint, GLuint *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *); _mesa_GetnUniformuivARB(GLuint, GLint, GLsizei, GLuint *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params); _mesa_GetUniformuiv(GLuint program, GLint location, GLuint *params);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); _mesa_GetnUniformdvARB(GLuint, GLint, GLsizei, GLdouble *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); _mesa_GetUniformdv(GLuint, GLint, GLdouble *);
GLint GLAPIENTRY GLint GLAPIENTRY
_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *); _mesa_GetUniformLocation(GLuint, const GLcharARB *);
GLuint GLAPIENTRY GLuint GLAPIENTRY
_mesa_GetUniformBlockIndex(GLuint program, _mesa_GetUniformBlockIndex(GLuint program,
const GLchar *uniformBlockName); const GLchar *uniformBlockName);
@ -243,8 +243,8 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex,
GLsizei bufSize, GLsizei *length, GLsizei bufSize, GLsizei *length,
GLchar *uniformName); GLchar *uniformName);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *, _mesa_GetActiveUniform(GLuint, GLuint, GLsizei, GLsizei *,
GLint *, GLenum *, GLcharARB *); GLint *, GLenum *, GLcharARB *);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetActiveUniformsiv(GLuint program, _mesa_GetActiveUniformsiv(GLuint program,
GLsizei uniformCount, GLsizei uniformCount,
@ -252,7 +252,7 @@ _mesa_GetActiveUniformsiv(GLuint program,
GLenum pname, GLenum pname,
GLint *params); GLint *params);
void GLAPIENTRY void GLAPIENTRY
_mesa_GetUniformiv(GLhandleARB, GLint, GLint *); _mesa_GetUniformiv(GLuint, GLint, GLint *);
long long
_mesa_parse_program_resource_name(const GLchar *name, _mesa_parse_program_resource_name(const GLchar *name,