diff options
| -rw-r--r-- | src/amd/vulkan/radv_shader.c | 4 | ||||
| -rw-r--r-- | src/compiler/shader_info.h | 6 | ||||
| -rw-r--r-- | src/compiler/spirv/nir_spirv.h | 1 | ||||
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 3eddc089d40..2fc7060d6c2 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -214,9 +214,7 @@ radv_shader_compile_to_nir(struct radv_device *device, .multiview = true, .subgroup_basic = true, .variable_pointers = true, - }, - .exts = { - .AMD_gcn_shader = true, + .gcn_shader = true, }, }; entry_point = spirv_to_nir(spirv, module->size / 4, diff --git a/src/compiler/shader_info.h b/src/compiler/shader_info.h index b1e200070f7..0eeb2ca58ea 100644 --- a/src/compiler/shader_info.h +++ b/src/compiler/shader_info.h @@ -51,11 +51,7 @@ struct spirv_supported_capabilities { bool subgroup_quad; bool subgroup_shuffle; bool subgroup_vote; -}; - -/* The supported extensions which add extended instructions */ -struct spirv_supported_extensions { - bool AMD_gcn_shader; + bool gcn_shader; }; typedef struct shader_info { diff --git a/src/compiler/spirv/nir_spirv.h b/src/compiler/spirv/nir_spirv.h index 2b0bdaec013..a2c40e57d18 100644 --- a/src/compiler/spirv/nir_spirv.h +++ b/src/compiler/spirv/nir_spirv.h @@ -59,7 +59,6 @@ struct spirv_to_nir_options { bool lower_workgroup_access_to_offsets; struct spirv_supported_capabilities caps; - struct spirv_supported_extensions exts; struct { void (*func)(void *private_data, diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index df01f4ff4a3..f06dca90efd 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -376,7 +376,7 @@ vtn_handle_extension(struct vtn_builder *b, SpvOp opcode, if (strcmp((const char *)&w[2], "GLSL.std.450") == 0) { val->ext_handler = vtn_handle_glsl450_instruction; } else if ((strcmp((const char *)&w[2], "SPV_AMD_gcn_shader") == 0) - && (b->options && b->options->exts.AMD_gcn_shader)) { + && (b->options && b->options->caps.gcn_shader)) { val->ext_handler = vtn_handle_amd_gcn_shader_instruction; } else { vtn_fail("Unsupported extension"); |