From fce02f4020ae1a48ce02201df2895b9477ea22d2 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 16 Jun 2020 11:02:23 +1000 Subject: [PATCH] mesa/gles3: add support for GL_EXT_shader_group_vote MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is the GLES equivalent to ARB_shader_group_vote. Passes: KHR-GLES31.core.shader_group_vote.* Reviewed-by: Marek Olšák Part-of: --- docs/features.txt | 1 + docs/relnotes/new_features.txt | 1 + src/compiler/glsl/builtin_functions.cpp | 20 +++++++++++++++++++- src/compiler/glsl/glsl_parser_extras.cpp | 1 + src/compiler/glsl/glsl_parser_extras.h | 2 ++ src/mesa/main/extensions_table.h | 1 + 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/docs/features.txt b/docs/features.txt index 314bc574bf5..0c607ba91ef 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -325,6 +325,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve GL_EXT_semaphore DONE (radeonsi) GL_EXT_semaphore_fd DONE (radeonsi) GL_EXT_semaphore_win32 not started + GL_EXT_shader_group_vote DONE (all drivers that support ARB_shader_group_vote) GL_EXT_sRGB_write_control DONE (all drivers that support GLES 3.0+) GL_EXT_texture_norm16 DONE (freedreno, i965, r600, radeonsi, nvc0) GL_EXT_texture_sRGB_R8 DONE (all drivers that support GLES 3.0+) diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt index 13e179456e4..f3ca40d80a8 100644 --- a/docs/relnotes/new_features.txt +++ b/docs/relnotes/new_features.txt @@ -1,4 +1,5 @@ GL_ARB_compute_variable_group_size on Iris. +GL_EXT_shader_group_vote on GLES3. VK_AMD_texture_gather_bias_lod on RADV. VK_EXT_private_data on ANV and RADV. VK_EXT_custom_border_color on RADV. diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 1aead1d9e12..172633042ba 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -777,10 +777,16 @@ vote(const _mesa_glsl_parse_state *state) return state->ARB_shader_group_vote_enable; } +static bool +vote_ext(const _mesa_glsl_parse_state *state) +{ + return state->EXT_shader_group_vote_enable; +} + static bool vote_or_v460_desktop(const _mesa_glsl_parse_state *state) { - return state->ARB_shader_group_vote_enable || v460_desktop(state); + return state->EXT_shader_group_vote_enable || state->ARB_shader_group_vote_enable || v460_desktop(state); } static bool @@ -4274,6 +4280,18 @@ builtin_builder::create_builtins() _vote("__intrinsic_vote_eq", vote), NULL); + add_function("anyInvocationEXT", + _vote("__intrinsic_vote_any", vote_ext), + NULL); + + add_function("allInvocationsEXT", + _vote("__intrinsic_vote_all", vote_ext), + NULL); + + add_function("allInvocationsEqualEXT", + _vote("__intrinsic_vote_eq", vote_ext), + NULL); + add_function("anyInvocation", _vote("__intrinsic_vote_any", v460_desktop), NULL); diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index e5c9f83e63a..647402eee3e 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -737,6 +737,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(EXT_separate_shader_objects), EXT(EXT_shader_framebuffer_fetch), EXT(EXT_shader_framebuffer_fetch_non_coherent), + EXT(EXT_shader_group_vote), EXT(EXT_shader_image_load_formatted), EXT(EXT_shader_image_load_store), EXT(EXT_shader_implicit_conversions), diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index bdc0d9ab827..e6b9b196dad 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -845,6 +845,8 @@ struct _mesa_glsl_parse_state { bool EXT_shader_framebuffer_fetch_warn; bool EXT_shader_framebuffer_fetch_non_coherent_enable; bool EXT_shader_framebuffer_fetch_non_coherent_warn; + bool EXT_shader_group_vote_enable; + bool EXT_shader_group_vote_warn; bool EXT_shader_image_load_formatted_enable; bool EXT_shader_image_load_formatted_warn; bool EXT_shader_image_load_store_enable; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 18d5f8073bf..9780bf0079a 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -278,6 +278,7 @@ EXT(EXT_separate_shader_objects , dummy_true EXT(EXT_separate_specular_color , dummy_true , GLL, x , x , x , 1997) 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_group_vote , ARB_shader_group_vote , x, x, x , 30, 2013) 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) -- 2.30.2