Mesa (master): radv/aco: enable VK_KHR_subgroup_extended_types on GFX8+

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Thu May 21 17:14:12 2020 +0200

radv/aco: enable VK_KHR_subgroup_extended_types on GFX8+

Should be working now.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5148>

---

 docs/relnotes/new_features.txt    | 1 +
 src/amd/vulkan/radv_device.c      | 2 +-
 src/amd/vulkan/radv_extensions.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index 1e86e153545..710318cc7fa 100644
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -5,3 +5,4 @@ VK_EXT_custom_border_color on RADV.
 VK_EXT_pipeline_creation_cache_control on RADV.
 VK_EXT_subgroup_size_control on RADV/ACO.
 VK_GOOGLE_user_type on ANV and RADV.
+VK_KHR_subgroup_extended_types on RADV/ACO.
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 6b8ab29d5a9..c4493d01788 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1011,7 +1011,7 @@ radv_get_physical_device_features_1_2(struct radv_physical_device *pdevice,
 	f->scalarBlockLayout = pdevice->rad_info.chip_class >= GFX7;
 	f->imagelessFramebuffer = true;
 	f->uniformBufferStandardLayout = true;
-	f->shaderSubgroupExtendedTypes = !pdevice->use_aco;
+	f->shaderSubgroupExtendedTypes = !pdevice->use_aco || pdevice->rad_info.chip_class >= GFX8;
 	f->separateDepthStencilLayouts = true;
 	f->hostQueryReset = true;
 	f->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 1a7fea960bd..ea955a136fc 100644
--- a/src/amd/vulkan/radv_extensions.py
+++ b/src/amd/vulkan/radv_extensions.py
@@ -100,7 +100,7 @@ EXTENSIONS = [
     Extension('VK_KHR_shader_float_controls',             1, True),
     Extension('VK_KHR_shader_float16_int8',               1, '!device->use_aco || device->rad_info.chip_class >= GFX8'),
     Extension('VK_KHR_shader_non_semantic_info',          1, True),
-    Extension('VK_KHR_shader_subgroup_extended_types',    1, '!device->use_aco'),
+    Extension('VK_KHR_shader_subgroup_extended_types',    1, '!device->use_aco || device->rad_info.chip_class >= GFX8'),
     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'),