From 06d4e06d8aa35d50516554061e1bc1e773aed2c2 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 8 Jul 2019 16:30:56 +0200 Subject: [PATCH] [dxbc] Enable early discard on RADV/ACO Still can't enable on LLVM due to GPU hangs. The way we detect it may have to change in the future, but for now, this should do. --- src/dxbc/dxbc_options.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dxbc/dxbc_options.cpp b/src/dxbc/dxbc_options.cpp index b54cc10d..e277409c 100644 --- a/src/dxbc/dxbc_options.cpp +++ b/src/dxbc/dxbc_options.cpp @@ -43,10 +43,12 @@ namespace dxvk { if (DxvkGpuVendor(devInfo.core.properties.vendorID) != DxvkGpuVendor::Amd) constantBufferRangeCheck = options.constantBufferRangeCheck; - // Disable early discard on RADV due to GPU hangs + // Disable early discard on RADV (with LLVM) due to GPU hangs // Disable early discard on Nvidia because it may hurt performance - if (adapter->matchesDriver(DxvkGpuVendor::Amd, VK_DRIVER_ID_MESA_RADV_KHR, 0, 0) - || adapter->matchesDriver(DxvkGpuVendor::Nvidia, VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR, 0, 0)) + bool isRadvAco = std::string(devInfo.core.properties.deviceName).find("RADV/ACO") != std::string::npos; + + if ((adapter->matchesDriver(DxvkGpuVendor::Amd, VK_DRIVER_ID_MESA_RADV_KHR, 0, 0) && !isRadvAco) + || (adapter->matchesDriver(DxvkGpuVendor::Nvidia, VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR, 0, 0))) useSubgroupOpsForEarlyDiscard = false; // Disable atomic counters on older RADV versions