From 50767214a790889120975bf0f598996c4f887dfc Mon Sep 17 00:00:00 2001 From: Alejandro Piñeiro Date: Thu, 8 Mar 2018 12:43:00 +0100 Subject: spirv/radv: add AMD_gcn_shader capability, remove current extensions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So now, during spirv_to_nir, it uses the capability instead of the extension. Note that we are really doing here is treating SPV_AMD_gcn_shader as other supported extensions. SPV_AMD_gcn_shader is not the first SPV extension supported. For example, the capability draw_parameters infers if the extension SPV_KHR_shader_draw_parameters is supported or not. This could be seen as counter-intuitive, and that it would be easier to define which extensions are supported, and based our checks on that, but we need to take into account that some capabilities are optional from core, and others came from new extensions. Also this commit would make the implementation of ARB_spirv_extensions easier. v2: AMD_gcn_shader capability renamed to gcn_shader (Daniel Schürmann) Reviewed-by: Daniel Schürmann Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_shader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/amd') 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, -- cgit v1.2.3