[Mesa-dev] [PATCH] glapi: add const qualifier to glShaderSourceARB() parameter

Jose Fonseca jfonseca at vmware.com
Wed Jun 27 09:42:34 PDT 2012


Sounds good.

I've noticed similar issues upgrading khronos headers in apitrace in the past -- every now and then the Khronos headers (or OS vendors) introduce slight differences in the prototopes, which is aggravated with C++ type checking rules.

Jose

----- Original Message -----
> Fixes the es2 build with gcc.
> 
> Note: in glext.h the prototypes for glShaderSource() and
> glShaderSourceARB()
> disagree:  only the former has the extra const qualifier.
> ---
>  src/mapi/glapi/gen/gl_API.xml |    2 +-
>  src/mesa/main/APIspec.xml     |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mapi/glapi/gen/gl_API.xml
> b/src/mapi/glapi/gen/gl_API.xml
> index af05135..2140a40 100644
> --- a/src/mapi/glapi/gen/gl_API.xml
> +++ b/src/mapi/glapi/gen/gl_API.xml
> @@ -5363,7 +5363,7 @@
>      <function name="ShaderSource" alias="ShaderSourceARB">
>          <param name="shader" type="GLuint"/>
>          <param name="count" type="GLsizei"/>
> -        <param name="string" type="const GLchar **"/>
> +        <param name="string" type="const GLchar * const *"/>
>          <param name="length" type="const GLint *"/>
>          <glx ignore="true"/>
>      </function>
> diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
> index 64e666e..f870cf7 100644
> --- a/src/mesa/main/APIspec.xml
> +++ b/src/mesa/main/APIspec.xml
> @@ -2946,7 +2946,7 @@
>  		<return type="void"/>
>  		<param name="shader" type="GLuint"/>
>  		<param name="count" type="GLsizei"/>
> -		<param name="string" type="const GLchar **"/>
> +		<param name="string" type="const GLchar * const *"/>
>  		<param name="length" type="const int *"/>
>  	</proto>
>  </template>
> --
> 1.7.3.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