From 4a3b42a717ce4fa4450066352f04f2e1ef78ad9a Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Tue, 8 Dec 2020 17:15:19 -0800
Subject: [PATCH] drisw: Prefer hardware-layered sw-winsys drivers over pure sw

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8128>
---
 .../auxiliary/target-helpers/inline_sw_helper.h      | 12 ++++++------
 src/gallium/auxiliary/target-helpers/sw_helper.h     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
index 9347909f326..e92b03be943 100644
--- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
@@ -78,6 +78,12 @@ sw_screen_create(struct sw_winsys *winsys)
 {
    const char *drivers[] = {
       debug_get_option("GALLIUM_DRIVER", ""),
+#if defined(GALLIUM_ZINK)
+      "zink",
+#endif
+#if defined(GALLIUM_D3D12)
+      "d3d12",
+#endif
 #if defined(GALLIUM_LLVMPIPE)
       "llvmpipe",
 #endif
@@ -86,12 +92,6 @@ sw_screen_create(struct sw_winsys *winsys)
 #endif
 #if defined(GALLIUM_SWR)
       "swr",
-#endif
-#if defined(GALLIUM_ZINK)
-      "zink",
-#endif
-#if defined(GALLIUM_D3D12)
-      "d3d12",
 #endif
    };
 
diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
index 4fbec159d79..a4eb9ee1067 100644
--- a/src/gallium/auxiliary/target-helpers/sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
@@ -84,6 +84,12 @@ sw_screen_create(struct sw_winsys *winsys)
 {
    const char *drivers[] = {
       debug_get_option("GALLIUM_DRIVER", ""),
+#if defined(GALLIUM_ZINK)
+      "zink",
+#endif
+#if defined(GALLIUM_D3D12)
+      "d3d12",
+#endif
 #if defined(GALLIUM_LLVMPIPE)
       "llvmpipe",
 #endif
@@ -92,12 +98,6 @@ sw_screen_create(struct sw_winsys *winsys)
 #endif
 #if defined(GALLIUM_SWR)
       "swr",
-#endif
-#if defined(GALLIUM_ZINK)
-      "zink",
-#endif
-#if defined(GALLIUM_D3D12)
-      "d3d12",
 #endif
    };