3 files changed, 7 insertions, 7 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 3fa4152425b..8c0acfaaf9c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -22,7 +22,7 @@
         "description": "drisw: move zink down the list below the sw drivers.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "4a3b42a717ce4fa4450066352f04f2e1ef78ad9a"
     },
diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
index c494840c44e..76eda8467b8 100644
--- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
@@ -81,9 +81,6 @@ sw_screen_create(struct sw_winsys *winsys)
    UNUSED bool only_sw = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
    const char *drivers[] = {
       debug_get_option("GALLIUM_DRIVER", ""),
-#if defined(GALLIUM_ZINK)
-      only_sw ? "" : "zink",
-#endif
 #if defined(GALLIUM_D3D12)
       only_sw ? "" : "d3d12",
 #endif
@@ -96,6 +93,9 @@ sw_screen_create(struct sw_winsys *winsys)
 #if defined(GALLIUM_SWR)
       "swr",
 #endif
+#if defined(GALLIUM_ZINK)
+      only_sw ? "" : "zink",
+#endif
    };
 
    for (unsigned i = 0; i < ARRAY_SIZE(drivers); i++) {
diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
index d9469d9f5e3..88a5086d261 100644
--- a/src/gallium/auxiliary/target-helpers/sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
@@ -86,9 +86,6 @@ sw_screen_create(struct sw_winsys *winsys)
    UNUSED bool only_sw = env_var_as_boolean("LIBGL_ALWAYS_SOFTWARE", false);
    const char *drivers[] = {
       debug_get_option("GALLIUM_DRIVER", ""),
-#if defined(GALLIUM_ZINK)
-      only_sw ? "" : "zink",
-#endif
 #if defined(GALLIUM_D3D12)
       only_sw ? "" : "d3d12",
 #endif
@@ -101,6 +98,9 @@ sw_screen_create(struct sw_winsys *winsys)
 #if defined(GALLIUM_SWR)
       "swr",
 #endif
+#if defined(GALLIUM_ZINK)
+      only_sw ? "" : "zink",
+#endif
    };
 
    for (unsigned i = 0; i < ARRAY_SIZE(drivers); i++) {