From: Timur Kristóf <timur.kristof@gmail.com>
Date: Tue, 26 May 2020 23:31:35 +0000 (+0200)
Subject: radv/aco: Always enable subgroup shuffle.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d2fe60f1cf7995c6a52e5160d2e40cddf8aabeb;p=mesa.git

radv/aco: Always enable subgroup shuffle.

It is now supported by both backends on all hw.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5223>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 37ba40707e7..27ff12b5c2c 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1525,14 +1525,9 @@ radv_get_physical_device_properties_1_1(struct radv_physical_device *pdevice,
 					 VK_SUBGROUP_FEATURE_ARITHMETIC_BIT |
 					 VK_SUBGROUP_FEATURE_BALLOT_BIT |
 					 VK_SUBGROUP_FEATURE_CLUSTERED_BIT |
-					 VK_SUBGROUP_FEATURE_QUAD_BIT;
-
-	if (((pdevice->rad_info.chip_class == GFX6 ||
-	      pdevice->rad_info.chip_class == GFX7) && !pdevice->use_aco) ||
-	    pdevice->rad_info.chip_class >= GFX8) {
-		p->subgroupSupportedOperations |= VK_SUBGROUP_FEATURE_SHUFFLE_BIT |
-						  VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT;
-	}
+					 VK_SUBGROUP_FEATURE_QUAD_BIT |
+					 VK_SUBGROUP_FEATURE_SHUFFLE_BIT |
+					 VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT;
 	p->subgroupQuadOperationsInAllStages = true;
 
 	p->pointClippingBehavior = VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES;