Regardless of the other discussion, patches 1 & 2 are
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 03/08/2014 05:10 PM, Brian Paul wrote:
> The GL specs say the parameter is GLuint, not GLhandleARB.
> ---
> src/mapi/glapi/gen/ARB_robustness.xml | 8 ++++----
> src/mesa/main/uniform_query.cpp | 6 +++---
> src/mesa/main/uniforms.c | 20 ++++++++++----------
> src/mesa/main/uniforms.h | 24 ++++++++++++------------
> 4 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/src/mapi/glapi/gen/ARB_robustness.xml
> b/src/mapi/glapi/gen/ARB_robustness.xml
> index 14048bf..6584314 100644
> --- a/src/mapi/glapi/gen/ARB_robustness.xml
> +++ b/src/mapi/glapi/gen/ARB_robustness.xml
> @@ -152,28 +152,28 @@
>
> <!-- OpenGL 2.0 sized buffer queries -->
> <function name="GetnUniformfvARB" offset="assign">
> - <param name="program" type="GLhandleARB"/>
> + <param name="program" type="GLuint"/>
> <param name="location" type="GLint"/>
> <param name="bufSize" type="GLsizei"/>
> <param name="params" type="GLfloat *" output="true"/>
> </function>
>
> <function name="GetnUniformivARB" offset="assign">
> - <param name="program" type="GLhandleARB"/>
> + <param name="program" type="GLuint"/>
> <param name="location" type="GLint"/>
> <param name="bufSize" type="GLsizei"/>
> <param name="params" type="GLint *" output="true"/>
> </function>
>
> <function name="GetnUniformuivARB" offset="assign">
> - <param name="program" type="GLhandleARB"/>
> + <param name="program" type="GLuint"/>
> <param name="location" type="GLint"/>
> <param name="bufSize" type="GLsizei"/>
> <param name="params" type="GLuint *" output="true"/>
> </function>
>
> <function name="GetnUniformdvARB" offset="assign">
> - <param name="program" type="GLhandleARB"/>
> + <param name="program" type="GLuint"/>
> <param name="location" type="GLint"/>
> <param name="bufSize" type="GLsizei"/>
> <param name="params" type="GLdouble *" output="true"/>
> diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
> index 8cc5da7..09c9212 100644
> --- a/src/mesa/main/uniform_query.cpp
> +++ b/src/mesa/main/uniform_query.cpp
> @@ -40,9 +40,9 @@
>
>
> extern "C" void GLAPIENTRY
> -_mesa_GetActiveUniform(GLhandleARB program, GLuint index,
> - GLsizei maxLength, GLsizei *length, GLint *size,
> - GLenum *type, GLcharARB *nameOut)
> +_mesa_GetActiveUniform(GLuint program, GLuint index,
> + GLsizei maxLength, GLsizei *length, GLint *size,
> + GLenum *type, GLcharARB *nameOut)
> {
> GET_CURRENT_CONTEXT(ctx);
> struct gl_shader_program *shProg =
> diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
> index c25c2df..e9b374b 100644
> --- a/src/mesa/main/uniforms.c
> +++ b/src/mesa/main/uniforms.c
> @@ -822,7 +822,7 @@ _mesa_ProgramUniformMatrix4x3fv(GLuint program, GLint
> location, GLsizei count,
>
>
> void GLAPIENTRY
> -_mesa_GetnUniformfvARB(GLhandleARB program, GLint location,
> +_mesa_GetnUniformfvARB(GLuint program, GLint location,
> GLsizei bufSize, GLfloat *params)
> {
> GET_CURRENT_CONTEXT(ctx);
> @@ -830,14 +830,14 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint
> location,
> }
>
> 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);
> }
>
>
> void GLAPIENTRY
> -_mesa_GetnUniformivARB(GLhandleARB program, GLint location,
> +_mesa_GetnUniformivARB(GLuint program, GLint location,
> GLsizei bufSize, GLint *params)
> {
> GET_CURRENT_CONTEXT(ctx);
> @@ -845,7 +845,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint
> location,
> }
>
> 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);
> }
> @@ -853,7 +853,7 @@ _mesa_GetUniformiv(GLhandleARB program, GLint location,
> GLint *params)
>
> /* GL3 */
> void GLAPIENTRY
> -_mesa_GetnUniformuivARB(GLhandleARB program, GLint location,
> +_mesa_GetnUniformuivARB(GLuint program, GLint location,
> GLsizei bufSize, GLuint *params)
> {
> GET_CURRENT_CONTEXT(ctx);
> @@ -861,7 +861,7 @@ _mesa_GetnUniformuivARB(GLhandleARB program, GLint
> location,
> }
>
> 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);
> }
> @@ -869,8 +869,8 @@ _mesa_GetUniformuiv(GLhandleARB program, GLint location,
> GLuint *params)
>
> /* GL4 */
> void GLAPIENTRY
> -_mesa_GetnUniformdvARB(GLhandleARB program, GLint location,
> - GLsizei bufSize, GLdouble *params)
> +_mesa_GetnUniformdvARB(GLuint program, GLint location,
> + GLsizei bufSize, GLdouble *params)
> {
> GET_CURRENT_CONTEXT(ctx);
>
> @@ -887,14 +887,14 @@ _mesa_GetnUniformdvARB(GLhandleARB program, GLint
> location,
> }
>
> 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);
> }
>
>
> GLint GLAPIENTRY
> -_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
> +_mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name)
> {
> struct gl_shader_program *shProg;
> GLuint index, offset;
> diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
> index bd50fd9..ba21b79 100644
> --- a/src/mesa/main/uniforms.h
> +++ b/src/mesa/main/uniforms.h
> @@ -195,23 +195,23 @@ _mesa_ProgramUniformMatrix4x3fv(GLuint program, GLint
> location, GLsizei count,
> GLboolean transpose, const GLfloat *value);
>
> void GLAPIENTRY
> -_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *);
> +_mesa_GetnUniformfvARB(GLuint, GLint, GLsizei, GLfloat *);
> void GLAPIENTRY
> -_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *);
> +_mesa_GetUniformfv(GLuint, GLint, GLfloat *);
> void GLAPIENTRY
> -_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *);
> +_mesa_GetnUniformivARB(GLuint, GLint, GLsizei, GLint *);
> void GLAPIENTRY
> -_mesa_GetUniformuiv(GLhandleARB, GLint, GLuint *);
> +_mesa_GetUniformuiv(GLuint, GLint, GLuint *);
> void GLAPIENTRY
> -_mesa_GetnUniformuivARB(GLhandleARB, GLint, GLsizei, GLuint *);
> +_mesa_GetnUniformuivARB(GLuint, GLint, GLsizei, GLuint *);
> void GLAPIENTRY
> -_mesa_GetUniformuiv(GLhandleARB program, GLint location, GLuint *params);
> +_mesa_GetUniformuiv(GLuint program, GLint location, GLuint *params);
> void GLAPIENTRY
> -_mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *);
> +_mesa_GetnUniformdvARB(GLuint, GLint, GLsizei, GLdouble *);
> void GLAPIENTRY
> -_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *);
> +_mesa_GetUniformdv(GLuint, GLint, GLdouble *);
> GLint GLAPIENTRY
> -_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *);
> +_mesa_GetUniformLocation(GLuint, const GLcharARB *);
> GLuint GLAPIENTRY
> _mesa_GetUniformBlockIndex(GLuint program,
> const GLchar *uniformBlockName);
> @@ -243,8 +243,8 @@ _mesa_GetActiveUniformName(GLuint program, GLuint
> uniformIndex,
> GLsizei bufSize, GLsizei *length,
> GLchar *uniformName);
> void GLAPIENTRY
> -_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *,
> - GLint *, GLenum *, GLcharARB *);
> +_mesa_GetActiveUniform(GLuint, GLuint, GLsizei, GLsizei *,
> + GLint *, GLenum *, GLcharARB *);
> void GLAPIENTRY
> _mesa_GetActiveUniformsiv(GLuint program,
> GLsizei uniformCount,
> @@ -252,7 +252,7 @@ _mesa_GetActiveUniformsiv(GLuint program,
> GLenum pname,
> GLint *params);
> void GLAPIENTRY
> -_mesa_GetUniformiv(GLhandleARB, GLint, GLint *);
> +_mesa_GetUniformiv(GLuint, GLint, GLint *);
>
> long
> _mesa_parse_program_resource_name(const GLchar *name,
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
