From b3e3440c87709d185379dc57a5311802eee51548 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 19 Apr 2019 12:40:37 +0200 Subject: [PATCH] radv: add VK_NV_compute_shader_derivates support Only computeDerivativeGroupLinear is supported for now. All crucible tests pass. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_device.c | 7 +++++++ src/amd/vulkan/radv_extensions.py | 1 + src/amd/vulkan/radv_shader.c | 1 + 3 files changed, 9 insertions(+) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 774ee5b91df..a31860eabf4 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -927,6 +927,13 @@ void radv_GetPhysicalDeviceFeatures2( features->descriptorBindingInlineUniformBlockUpdateAfterBind = true; break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV: { + VkPhysicalDeviceComputeShaderDerivativesFeaturesNV *features = + (VkPhysicalDeviceComputeShaderDerivativesFeaturesNV *)ext; + features->computeDerivativeGroupQuads = false; + features->computeDerivativeGroupLinear = true; + break; + } default: break; } diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 40fc585c503..9743ce1a774 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -133,6 +133,7 @@ EXTENSIONS = [ Extension('VK_AMD_shader_trinary_minmax', 1, True), Extension('VK_GOOGLE_decorate_string', 1, True), Extension('VK_GOOGLE_hlsl_functionality1', 1, True), + Extension('VK_NV_compute_shader_derivatives', 1, 'device->rad_info.chip_class >= VI'), ] class VkVersion: diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index c802abb0e08..13f1f9aa9dc 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -223,6 +223,7 @@ radv_shader_compile_to_nir(struct radv_device *device, const struct spirv_to_nir_options spirv_options = { .lower_ubo_ssbo_access_to_offsets = true, .caps = { + .derivative_group = true, .descriptor_array_dynamic_indexing = true, .device_group = true, .draw_parameters = true, -- 2.30.2