[Mesa-dev] [PATCH] get: reconcile aliasing enums for MaxCombinedShaderOutputResources

[Kenneth Graunke]

On Thursday, March 10, 2016 6:26:43 PM PDT Nicolai Hähnle wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
> 
> The enums MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS and
> MAX_COMBINED_SHADER_OUTPUT_RESOURCES are equal and should therefore only
> appear once.
> 
> Noticed while implementing ARB_shader_image_load_store without previously
> implementing SSBO.
> ---
>  src/mesa/main/get.c              | 7 +++++++
>  src/mesa/main/get_hash_params.py | 6 ++++--
>  2 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 67c4f99..b0fadc9 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -384,6 +384,13 @@ static const int 
extra_ARB_shader_storage_buffer_object_and_geometry_shader[] =
>     EXTRA_END
>  };
>  
> +static const int 
extra_ARB_shader_image_load_store_shader_storage_buffer_object_es31[] = {
> +   EXT(ARB_shader_image_load_store),
> +   EXT(ARB_shader_storage_buffer_object),
> +   EXTRA_API_ES31,
> +   EXTRA_END
> +};
> +
>  static const int extra_ARB_framebuffer_no_attachments_and_geometry_shader[] 
= {
>     EXTRA_EXT_FB_NO_ATTACH_GS,
>     EXTRA_END
> diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/
get_hash_params.py
> index f9d66f8..12c2189 100644
> --- a/src/mesa/main/get_hash_params.py
> +++ b/src/mesa/main/get_hash_params.py
> @@ -495,9 +495,12 @@ descriptor=[
>    [ "MAX_COMBINED_SHADER_STORAGE_BLOCKS", 
"CONTEXT_INT(Const.MaxCombinedShaderStorageBlocks), 
extra_ARB_shader_storage_buffer_object_es31" ],
>    [ "MAX_SHADER_STORAGE_BLOCK_SIZE", 
"CONTEXT_INT(Const.MaxShaderStorageBlockSize), 
extra_ARB_shader_storage_buffer_object_es31" ],
>    [ "MAX_SHADER_STORAGE_BUFFER_BINDINGS", 
"CONTEXT_INT(Const.MaxShaderStorageBufferBindings), 
extra_ARB_shader_storage_buffer_object_es31" ],
> -  [ "MAX_COMBINED_SHADER_OUTPUT_RESOURCES", 
"CONTEXT_INT(Const.MaxCombinedShaderOutputResources), 
extra_ARB_shader_storage_buffer_object_es31" ],
>    [ "SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT", 
"CONTEXT_INT(Const.ShaderStorageBufferOffsetAlignment), 
extra_ARB_shader_storage_buffer_object_es31" ],
>    [ "SHADER_STORAGE_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, 
extra_ARB_shader_storage_buffer_object_es31" ],
> +
> +  # GL_ARB_shader_image_load_store / GL_ARB_shader_storage_buffer_object / 
GLES 3.1
> +  # (MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS in 
GL_ARB_shader_image_load_store)
> +  [ "MAX_COMBINED_SHADER_OUTPUT_RESOURCES", 
"CONTEXT_INT(Const.MaxCombinedShaderOutputResources), 
extra_ARB_shader_image_load_store_shader_storage_buffer_object_es31" ],
>  ]},
>  
>  # Enums in OpenGL Core profile and ES 3.1
> @@ -841,7 +844,6 @@ descriptor=[
>    [ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", 
"CONTEXT_INT(Const.MaxProgramTextureGatherComponents), 
extra_ARB_texture_gather"],
>  
>  # GL_ARB_shader_image_load_store
> -  [ "MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS", 
"CONTEXT_INT(Const.MaxCombinedShaderOutputResources), 
extra_ARB_shader_image_load_store" ],
>    [ "MAX_IMAGE_SAMPLES", "CONTEXT_INT(Const.MaxImageSamples), 
extra_ARB_shader_image_load_store" ],
>  
>  # GL_EXT_polygon_offset_clamp
> 

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160313/41092860/attachment-0001.sig>