[Mesa-dev] [PATCH 2/2] mesa: add const qualifier to glMultiDrawElementsEXT() indices param

Jose Fonseca jfonseca at vmware.com
Wed Jun 26 10:43:44 PDT 2013


Series looks good to me.

Jose

----- Original Message -----
> The 20130624 version of glext.h changed this to match the
> glMultiDrawElements() function which already had the extra const
> qualifier.
> 
> Fixes warnings/errors that seem to vary from one compiler to the next.
> ---
>  src/mapi/glapi/gen/gl_API.xml |    2 +-
>  src/mesa/vbo/vbo_exec_array.c |    2 +-
>  src/mesa/vbo/vbo_save_api.c   |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
> index f725797..a066fe2 100644
> --- a/src/mapi/glapi/gen/gl_API.xml
> +++ b/src/mapi/glapi/gen/gl_API.xml
> @@ -10168,7 +10168,7 @@
>          <param name="mode" type="GLenum"/>
>          <param name="count" type="const GLsizei *"/>
>          <param name="type" type="GLenum"/>
> -        <param name="indices" type="const GLvoid **"/>
> +        <param name="indices" type="const GLvoid * const *"/>
>          <param name="primcount" type="GLsizei"/>
>          <glx handcode="true"/>
>      </function>
> diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
> index 9dadd04..75831fa 100644
> --- a/src/mesa/vbo/vbo_exec_array.c
> +++ b/src/mesa/vbo/vbo_exec_array.c
> @@ -1371,7 +1371,7 @@ vbo_validated_multidrawelements(struct gl_context *ctx,
> GLenum mode,
>  static void GLAPIENTRY
>  vbo_exec_MultiDrawElements(GLenum mode,
>  			   const GLsizei *count, GLenum type,
> -			   const GLvoid **indices,
> +			   const GLvoid * const *indices,
>  			   GLsizei primcount)
>  {
>     GET_CURRENT_CONTEXT(ctx);
> diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
> index 26951bd..2028d8b 100644
> --- a/src/mesa/vbo/vbo_save_api.c
> +++ b/src/mesa/vbo/vbo_save_api.c
> @@ -1182,7 +1182,7 @@ _save_OBE_DrawRangeElements(GLenum mode, GLuint start,
> GLuint end,
>  
>  static void GLAPIENTRY
>  _save_OBE_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
> -                            const GLvoid **indices, GLsizei primcount)
> +                            const GLvoid * const *indices, GLsizei
> primcount)
>  {
>     GLsizei i;
>  
> --
> 1.7.10.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 


More information about the mesa-dev mailing list