From 52c0e6e5b30597d4b19864532a482cfd5101a626 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 28 Sep 2021 13:01:53 +0300 Subject: [PATCH] spirv: switch Groups capability to non AMD specific field Signed-off-by: Lionel Landwerlin Reviewed-by: Caio Marcelo de Oliveira Filho Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_shader.c | 1 + src/compiler/shader_info.h | 1 + src/compiler/spirv/spirv_to_nir.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index b693e37525d..7d9e83a4bc0 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -476,6 +476,7 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module * .float64 = true, .float64_atomic_min_max = true, .geometry_streams = true, + .groups = true, .image_atomic_int64 = true, .image_ms_array = true, .image_read_without_format = true, diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index c4cc267fc0c..405b2042288 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -57,6 +57,7 @@ struct spirv_supported_capabilities { bool fragment_shading_rate; bool generic_pointers; bool geometry_streams; + bool groups; bool image_ms_array; bool image_read_without_format; bool image_write_without_format; diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index fd372cd4b95..fa80522cde1 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -4535,7 +4535,7 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, break; case SpvCapabilityGroups: - spv_check_supported(amd_shader_ballot, cap); + spv_check_supported(groups, cap); break; case SpvCapabilitySubgroupDispatch: