Mesa (master): radv: move handling nosisched option in a better place

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: 0defc5554780a444c9e2009178dc88f97740a174
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0defc5554780a444c9e2009178dc88f97740a174

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed May  9 23:52:53 2018 +0200

radv: move handling nosisched option in a better place

It's a per-application optimization, so it makes more sense
to do that in radv_handle_per_app_options().

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_device.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 08795dd6b6..a7f4a5ab7b 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -428,10 +428,12 @@ radv_handle_per_app_options(struct radv_instance *instance,
 
 	if (!strcmp(name, "Talos - Linux - 32bit") ||
 	    !strcmp(name, "Talos - Linux - 64bit")) {
-		/* Force enable LLVM sisched for Talos because it looks safe
-		 * and it gives few more FPS.
-		 */
-		instance->perftest_flags |= RADV_PERFTEST_SISCHED;
+		if (!(instance->debug_flags & RADV_DEBUG_NO_SISCHED)) {
+			/* Force enable LLVM sisched for Talos because it looks
+			 * safe and it gives few more FPS.
+			 */
+			instance->perftest_flags |= RADV_PERFTEST_SISCHED;
+		}
 	}
 }
 
@@ -508,14 +510,6 @@ VkResult radv_CreateInstance(
 
 	radv_handle_per_app_options(instance, pCreateInfo->pApplicationInfo);
 
-	if (instance->debug_flags & RADV_DEBUG_NO_SISCHED) {
-		/* Disable sisched when the user requests it, this is mostly
-		 * useful when the driver force-enable sisched for the given
-		 * application.
-		 */
-		instance->perftest_flags &= ~RADV_PERFTEST_SISCHED;
-	}
-
 	*pInstance = radv_instance_to_handle(instance);
 
 	return VK_SUCCESS;