From: Rhys Perry <pendingchaos02@gmail.com>
Date: Thu, 10 Oct 2019 11:10:15 +0000 (+0100)
Subject: radv/aco: disable NGG when ACO is used
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba71be228fc063b27ad292d206f8c1cac631a73a;p=mesa.git

radv/aco: disable NGG when ACO is used

Note that radv_device.c still has to be modified to use ACO with Navi.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-By: Timur Kristóf <timur.kristof@gmail.com>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 582ab228802..cf57a441481 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -339,6 +339,10 @@ radv_physical_device_init(struct radv_physical_device *device,
 	device->use_ngg = device->rad_info.chip_class >= GFX10 &&
 			  device->rad_info.family != CHIP_NAVI14 &&
 			  !(device->instance->debug_flags & RADV_DEBUG_NO_NGG);
+	if (device->use_aco && device->use_ngg) {
+		fprintf(stderr, "WARNING: disabling NGG because ACO is used.\n");
+		device->use_ngg = false;
+	}
 
 	device->use_ngg_streamout = false;