From 71e619a82549d9212c58a91ac0de53c0f21059dd Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 12 Jul 2019 15:46:27 +0200 Subject: [PATCH] glapi: add EXT_shader_image_load_store MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- .../glapi/gen/EXT_shader_image_load_store.xml | 82 +++++++++++++++++++ src/mapi/glapi/gen/gl_API.xml | 3 + src/mapi/glapi/gen/meson.build | 1 + src/mesa/main/extensions_table.h | 1 + src/mesa/main/mtypes.h | 1 + src/mesa/state_tracker/st_extensions.c | 4 + 6 files changed, 92 insertions(+) create mode 100644 src/mapi/glapi/gen/EXT_shader_image_load_store.xml diff --git a/src/mapi/glapi/gen/EXT_shader_image_load_store.xml b/src/mapi/glapi/gen/EXT_shader_image_load_store.xml new file mode 100644 index 00000000000..2a69357efa5 --- /dev/null +++ b/src/mapi/glapi/gen/EXT_shader_image_load_store.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index f6128f1a36e..c5e6a066ac6 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -12971,6 +12971,9 @@ + + diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index c36e49fbf94..1e69242e042 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -120,6 +120,7 @@ api_xml_files = files( 'EXT_packed_depth_stencil.xml', 'EXT_provoking_vertex.xml', 'EXT_separate_shader_objects.xml', + 'EXT_shader_image_load_store.xml', 'EXT_texture_array.xml', 'EXT_texture_integer.xml', 'EXT_transform_feedback.xml', diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index af321131654..3f313db870d 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -274,6 +274,7 @@ EXT(EXT_separate_specular_color , dummy_true EXT(EXT_shader_framebuffer_fetch , EXT_shader_framebuffer_fetch , GLL, GLC, x , ES2, 2013) EXT(EXT_shader_framebuffer_fetch_non_coherent, EXT_shader_framebuffer_fetch_non_coherent, GLL, GLC, x, ES2, 2018) EXT(EXT_shader_image_load_formatted , EXT_shader_image_load_formatted , GLL, GLC, x , x , 2014) +EXT(EXT_shader_image_load_store , EXT_shader_image_load_store , GLL, GLC, x , x , 2010) EXT(EXT_shader_implicit_conversions , dummy_true , x , x , x , 31, 2013) EXT(EXT_shader_integer_mix , EXT_shader_integer_mix , GLL, GLC, x , 30, 2013) EXT(EXT_shader_io_blocks , dummy_true , x , x , x , 31, 2014) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 56a63589182..30fe50affc0 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4289,6 +4289,7 @@ struct gl_extensions GLboolean EXT_semaphore; GLboolean EXT_semaphore_fd; GLboolean EXT_shader_image_load_formatted; + GLboolean EXT_shader_image_load_store; GLboolean EXT_shader_integer_mix; GLboolean EXT_shader_samples_identical; GLboolean EXT_sRGB; diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index c146c8d9902..abc816ed0d4 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -725,6 +725,7 @@ void st_init_extensions(struct pipe_screen *screen, { o(ARB_shader_draw_parameters), PIPE_CAP_DRAW_PARAMETERS }, { o(ARB_shader_group_vote), PIPE_CAP_TGSI_VOTE }, { o(EXT_shader_image_load_formatted), PIPE_CAP_IMAGE_LOAD_FORMATTED }, + { o(EXT_shader_image_load_store), PIPE_CAP_TGSI_ATOMINC_WRAP }, { o(ARB_shader_stencil_export), PIPE_CAP_SHADER_STENCIL_EXPORT }, { o(ARB_shader_texture_image_samples), PIPE_CAP_TGSI_TXQS }, { o(ARB_shader_texture_lod), PIPE_CAP_FRAGMENT_SHADER_TEXTURE_LOD }, @@ -1179,6 +1180,9 @@ void st_init_extensions(struct pipe_screen *screen, extensions->OES_sample_variables = extensions->ARB_sample_shading && extensions->ARB_gpu_shader5; + extensions->EXT_shader_image_load_store &= + screen->get_param(screen, PIPE_CAP_IMAGE_LOAD_FORMATTED); + /* Maximum sample count. */ { static const enum pipe_format color_formats[] = { -- 2.30.2