summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/get.c
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2016-03-10 17:41:29 -0500
committerNicolai Hähnle <nicolai.haehnle@amd.com>2016-03-14 17:19:14 -0500
commit9b68bdf6f8a06986340efa0c94afeeeb5580f9fd (patch)
treeed5ada997a5533f93fda89000a351304de2ac13d /src/mesa/main/get.c
parentb0546057220ac2906913bfd283aaefa6c4cb6038 (diff)
downloadexternal_mesa3d-9b68bdf6f8a06986340efa0c94afeeeb5580f9fd.zip
external_mesa3d-9b68bdf6f8a06986340efa0c94afeeeb5580f9fd.tar.gz
external_mesa3d-9b68bdf6f8a06986340efa0c94afeeeb5580f9fd.tar.bz2
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 <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main/get.c')
-rw-r--r--src/mesa/main/get.c7
1 files changed, 7 insertions, 0 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