From: Rhys Perry <pendingchaos02@gmail.com>
Date: Wed, 25 Sep 2019 11:04:51 +0000 (+0100)
Subject: radv/aco: actually disable ACO when unsupported
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0aef1a230e7f0f883296e25d965386b6b0859dcc;p=mesa.git

radv/aco: actually disable ACO when unsupported

We were setting this twice. The second time, we weren't later disabling
it if unsupported.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index af425b39b96..ea132ee8bc4 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -373,7 +373,6 @@ radv_physical_device_init(struct radv_physical_device *device,
 				    (device->use_aco || device->instance->perftest_flags & RADV_PERFTEST_SHADER_BALLOT);
 
 	device->use_ngg_streamout = false;
-	device->use_aco = device->instance->perftest_flags & RADV_PERFTEST_ACO;
 
 	/* Determine the number of threads per wave for all stages. */
 	device->cs_wave_size = 64;