[Mesa-dev] [PATCH 7/7] mesa/es3.1: enable GL_ARB_explicit_uniform_location for gles 3.1

[Tapani Pälli]

Instead of adding new one you should move the existing declaration to 
section:

"apis": ["GL", "GL_CORE", "GLES3"]

and make it use the new specified extra 
"extra_ARB_explicit_uniform_location_es31".

(same is actually true for all other patches, they all add enums that 
should be available for GL, GL_CORE, and GLES 3.1).

Thanks for starting this work, this really helps with the conformance 
suite that seems to call the getters as one of the first things.


On 05/06/2015 11:53 AM, Marta Lofstedt wrote:
> GL_ARB_explicit_uniform_location is required for gles 3.1
> conformance
>
> Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
> ---
>   src/mesa/main/get.c              | 6 ++++++
>   src/mesa/main/get_hash_params.py | 2 ++
>   2 files changed, 8 insertions(+)
>
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 97d3bf0..6fc0f3f 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -385,6 +385,12 @@ static const int extra_ARB_compute_shader_es31[] = {
>      EXTRA_END
>   };
>
> +static const int extra_ARB_explicit_uniform_location_es31[] = {
> +   EXT(ARB_explicit_uniform_location),
> +   EXTRA_API_ES31,
> +   EXTRA_END
> +};
> +
>   EXTRA_EXT(ARB_texture_cube_map);
>   EXTRA_EXT(EXT_texture_array);
>   EXTRA_EXT(NV_fog_distance);
> diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
> index 2e0b355..c64bb58 100644
> --- a/src/mesa/main/get_hash_params.py
> +++ b/src/mesa/main/get_hash_params.py
> @@ -450,6 +450,8 @@ descriptor=[
>     [ "MAX_COMPUTE_SHARED_MEMORY_SIZE", "CONST(MAX_COMPUTE_SHARED_MEMORY_SIZE), extra_ARB_compute_shader_es31" ],
>     [ "MAX_COMPUTE_UNIFORM_COMPONENTS", "CONST(MAX_COMPUTE_UNIFORM_COMPONENTS), extra_ARB_compute_shader_es31" ],
>     [ "MAX_COMPUTE_IMAGE_UNIFORMS", "CONST(MAX_COMPUTE_IMAGE_UNIFORMS), extra_ARB_compute_shader_es31" ],
> +# GL_ARB_explicit_uniform_location / GLES 3.1
> +  [ "MAX_UNIFORM_LOCATIONS", "CONTEXT_INT(Const.MaxUserAssignableUniformLocations), extra_ARB_explicit_uniform_location_es31" ],
>   ]},
>
>   # Remaining enums are only in OpenGL
>