From 8d7621a53f84b55d6f7fbcaab954df939dd47d50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 20 Nov 2019 12:41:19 +0100 Subject: [PATCH] radv: Enable Subgroup Arithmetic and Clustered for SI This patch also allows to enable VK_AMD_shader_ballot on SI. Reviewed-by: Samuel Pitoiset --- src/amd/vulkan/radv_device.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 5917c804883..dbdaa442c83 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -439,8 +439,7 @@ radv_physical_device_init(struct radv_physical_device *device, device->dcc_msaa_allowed = (device->instance->perftest_flags & RADV_PERFTEST_DCC_MSAA); - device->use_shader_ballot = device->rad_info.chip_class >= GFX8 && - (device->use_aco || device->instance->perftest_flags & RADV_PERFTEST_SHADER_BALLOT); + device->use_shader_ballot = device->use_aco || (device->instance->perftest_flags & RADV_PERFTEST_SHADER_BALLOT); device->use_ngg = device->rad_info.chip_class >= GFX10 && device->rad_info.family != CHIP_NAVI14 && @@ -1390,13 +1389,13 @@ void radv_GetPhysicalDeviceProperties2( properties->supportedStages = VK_SHADER_STAGE_ALL; properties->supportedOperations = VK_SUBGROUP_FEATURE_BASIC_BIT | + VK_SUBGROUP_FEATURE_VOTE_BIT | + VK_SUBGROUP_FEATURE_ARITHMETIC_BIT | VK_SUBGROUP_FEATURE_BALLOT_BIT | - VK_SUBGROUP_FEATURE_QUAD_BIT | - VK_SUBGROUP_FEATURE_VOTE_BIT; + VK_SUBGROUP_FEATURE_CLUSTERED_BIT | + VK_SUBGROUP_FEATURE_QUAD_BIT; if (pdevice->rad_info.chip_class >= GFX8) { properties->supportedOperations |= - VK_SUBGROUP_FEATURE_ARITHMETIC_BIT | - VK_SUBGROUP_FEATURE_CLUSTERED_BIT | VK_SUBGROUP_FEATURE_SHUFFLE_BIT | VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT; } -- 2.30.2