On 23/07/15 16:38, Marta Lofstedt wrote:
> From: Marta Lofstedt <marta.lofst...@intel.com>
>
> Signed-off-by: Marta Lofstedt <marta.lofst...@intel.com>
> ---
> src/mesa/main/get.c | 6 ++++++
> src/mesa/main/get_hash_params.py | 10 +++++-----
> 2 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 60c1b1b..a443493 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -385,6 +385,12 @@ static const int extra_ARB_texture_multisample_es31[] = {
> EXTRA_END
> };
>
> +static const int extra_ARB_texture_gather_es31[] = {
> + EXT(ARB_texture_gather),
> + 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 fbf2abf..d7e7a7a 100644
> --- a/src/mesa/main/get_hash_params.py
> +++ b/src/mesa/main/get_hash_params.py
> @@ -436,6 +436,11 @@ descriptor=[
> [ "MAX_INTEGER_SAMPLES", "CONTEXT_INT(Const.MaxIntegerSamples),
> extra_ARB_texture_multisample_es31" ],
> [ "SAMPLE_MASK", "CONTEXT_BOOL(Multisample.SampleMask),
> extra_ARB_texture_multisample_es31" ],
> [ "MAX_SAMPLE_MASK_WORDS", "CONST(1), extra_ARB_texture_multisample_es31"
> ],
> +
> +# GL_ARB_texture_gather / GLES 3.1
> + [ "MIN_PROGRAM_TEXTURE_GATHER_OFFSET",
> "CONTEXT_INT(Const.MinProgramTextureGatherOffset),
> extra_ARB_texture_gather_es31"],
> + [ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET",
> "CONTEXT_INT(Const.MaxProgramTextureGatherOffset),
> extra_ARB_texture_gather_es31"],
> + [ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB",
> "CONTEXT_INT(Const.MaxProgramTextureGatherComponents),
> extra_ARB_texture_gather_es31"],
I have not found MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB in GLES 3.1
spec. Can you confirm it?
Sam
> ]},
>
> # Enums in OpenGL Core profile and ES 3.1
> @@ -775,11 +780,6 @@ descriptor=[
> # GL_ARB_texture_cube_map_array
> [ "TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB", "LOC_CUSTOM, TYPE_INT,
> TEXTURE_CUBE_ARRAY_INDEX, extra_ARB_texture_cube_map_array" ],
>
> -# GL_ARB_texture_gather
> - [ "MIN_PROGRAM_TEXTURE_GATHER_OFFSET",
> "CONTEXT_INT(Const.MinProgramTextureGatherOffset), extra_ARB_texture_gather"],
> - [ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET",
> "CONTEXT_INT(Const.MaxProgramTextureGatherOffset), extra_ARB_texture_gather"],
> - [ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB",
> "CONTEXT_INT(Const.MaxProgramTextureGatherComponents),
> extra_ARB_texture_gather"],
> -
> # GL_ARB_separate_shader_objects
> [ "PROGRAM_PIPELINE_BINDING", "LOC_CUSTOM, TYPE_INT,
> GL_PROGRAM_PIPELINE_BINDING, NO_EXTRA" ],
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
