From 7b38d95b32f8a0faf5acf77dc2d05ed089df3a9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 15 Nov 2019 15:37:13 +0100 Subject: [PATCH] radv: Enable ACO on GFX7 (Sea Islands) This patch also disables AMD_shader_ballot on GFX7 by default if ACO is used. Note that shader_ballot works correctly, but performance seems inferior. To enable shader_ballot use RADV_PERFTEST=shader_ballot. Reviewed-by: Rhys Perry --- src/amd/vulkan/radv_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 431e64eeb6f..691f943f6b5 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -398,7 +398,7 @@ radv_physical_device_init(struct radv_physical_device *device, radv_handle_env_var_force_family(device); device->use_aco = instance->perftest_flags & RADV_PERFTEST_ACO; - if (device->rad_info.chip_class < GFX8 && device->use_aco) { + if (device->rad_info.chip_class < GFX7 && device->use_aco) { fprintf(stderr, "WARNING: disabling ACO on unsupported GPUs.\n"); device->use_aco = false; } @@ -439,7 +439,8 @@ 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->use_aco || (device->instance->perftest_flags & RADV_PERFTEST_SHADER_BALLOT); + device->use_shader_ballot = (device->use_aco && device->rad_info.chip_class >= GFX8) || + (device->instance->perftest_flags & RADV_PERFTEST_SHADER_BALLOT); device->use_ngg = device->rad_info.chip_class >= GFX10 && device->rad_info.family != CHIP_NAVI14 && -- 2.30.2