diff options
| author | Nicolai Hähnle <[email protected]> | 2016-03-10 17:41:29 -0500 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-03-14 17:19:14 -0500 |
| commit | 9b68bdf6f8a06986340efa0c94afeeeb5580f9fd (patch) | |
| tree | ed5ada997a5533f93fda89000a351304de2ac13d /src/mesa/main | |
| parent | b0546057220ac2906913bfd283aaefa6c4cb6038 (diff) | |
get: reconcile aliasing enums for MaxCombinedShaderOutputResources
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.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/get.c | 7 | ||||
| -rw-r--r-- | 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 67c4f99ceba..b0fadc93aef 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 f9d66f8db7c..12c21899cb1 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 |