From 9da94e510c3d751f10e60151fb9b50f419b5cd26 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 18 Oct 2019 18:04:52 +0200 Subject: [PATCH] radv: enable VK_KHR_shader_float_controls on GFX6-GFX7 Disable 16-bit features because fp16 isn't exposed on these chips. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_device.c | 6 +++--- src/amd/vulkan/radv_extensions.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 5fdb1903c09..aa466844ec4 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1514,10 +1514,10 @@ void radv_GetPhysicalDeviceProperties2( properties->shaderSignedZeroInfNanPreserveFloat32 = true; properties->shaderDenormFlushToZeroFloat16 = false; - properties->shaderDenormPreserveFloat16 = true; - properties->shaderRoundingModeRTEFloat16 = true; + properties->shaderDenormPreserveFloat16 = pdevice->rad_info.chip_class >= GFX8; + properties->shaderRoundingModeRTEFloat16 = pdevice->rad_info.chip_class >= GFX8; properties->shaderRoundingModeRTZFloat16 = false; - properties->shaderSignedZeroInfNanPreserveFloat16 = true; + properties->shaderSignedZeroInfNanPreserveFloat16 = pdevice->rad_info.chip_class >= GFX8; properties->shaderDenormFlushToZeroFloat64 = false; properties->shaderDenormPreserveFloat64 = true; diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py index 11d907ed341..7cdd6209d1a 100644 --- a/src/amd/vulkan/radv_extensions.py +++ b/src/amd/vulkan/radv_extensions.py @@ -89,7 +89,7 @@ EXTENSIONS = [ Extension('VK_KHR_shader_atomic_int64', 1, 'LLVM_VERSION_MAJOR >= 9'), Extension('VK_KHR_shader_clock', 1, True), Extension('VK_KHR_shader_draw_parameters', 1, True), - Extension('VK_KHR_shader_float_controls', 1, 'device->rad_info.chip_class >= GFX8 && !device->use_aco'), + Extension('VK_KHR_shader_float_controls', 1, '!device->use_aco'), Extension('VK_KHR_shader_float16_int8', 1, '!device->use_aco'), Extension('VK_KHR_storage_buffer_storage_class', 1, True), Extension('VK_KHR_surface', 25, 'RADV_HAS_SURFACE'), -- 2.30.2