Mesa (master): radv/aco: do not advertise VK_KHR_shader_subgroup_extended_types

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e2650db95276662661960f87be5d4d3537d8acf5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e2650db95276662661960f87be5d4d3537d8acf5

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Apr 14 15:39:26 2020 +0200

radv/aco: do not advertise VK_KHR_shader_subgroup_extended_types

It's unsupported because small bitsizes are still not completely
supported. It should have been disabled by default with ACO.

Acked-by: Daniel Schürmann <daniel at schuermann.dev>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4549>

---

 src/amd/vulkan/radv_device.c      | 4 ++--
 src/amd/vulkan/radv_extensions.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a57071bab5a..09b19ed0007 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1203,7 +1203,7 @@ void radv_GetPhysicalDeviceFeatures2(
 		case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES: {
 			VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *features =
 				(VkPhysicalDeviceShaderSubgroupExtendedTypesFeatures *)ext;
-			features->shaderSubgroupExtendedTypes = true;
+			features->shaderSubgroupExtendedTypes = !pdevice->use_aco;
 			break;
 		}
 		case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SEPARATE_DEPTH_STENCIL_LAYOUTS_FEATURES_KHR: {
@@ -1266,7 +1266,7 @@ void radv_GetPhysicalDeviceFeatures2(
 			features->scalarBlockLayout = pdevice->rad_info.chip_class >= GFX7;
 			features->imagelessFramebuffer = true;
 			features->uniformBufferStandardLayout = true;
-			features->shaderSubgroupExtendedTypes = true;
+			features->shaderSubgroupExtendedTypes = !pdevice->use_aco;
 			features->separateDepthStencilLayouts = true;
 			features->hostQueryReset = true;
 			features->timelineSemaphore = pdevice->rad_info.has_syncobj_wait_for_submit;
diff --git a/src/amd/vulkan/radv_extensions.py b/src/amd/vulkan/radv_extensions.py
index 55f3d2b6e37..23a6bb6702f 100644
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -94,7 +94,7 @@ EXTENSIONS = [
     Extension('VK_KHR_shader_float_controls',             1, True),
     Extension('VK_KHR_shader_float16_int8',               1, '!device->use_aco'),
     Extension('VK_KHR_shader_non_semantic_info',          1, True),
-    Extension('VK_KHR_shader_subgroup_extended_types',    1, True),
+    Extension('VK_KHR_shader_subgroup_extended_types',    1, '!device->use_aco'),
     Extension('VK_KHR_spirv_1_4',                         1, True),
     Extension('VK_KHR_storage_buffer_storage_class',      1, True),
     Extension('VK_KHR_surface',                          25, 'RADV_HAS_SURFACE'),