Mesa (staging/20.0): zink: confused compilation macro usage for zink in target helpers.

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: a06fc57fda64a62a48fa3b07cb55e9aae2569788
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a06fc57fda64a62a48fa3b07cb55e9aae2569788

Author: luc <814640709 at qq.com>
Date:   Sat Feb 15 12:55:16 2020 +0800

zink: confused compilation macro usage for zink in target helpers.

Fixes: 8d46e35d16e ("zink: introduce opengl over vulkan")
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3831>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3831>
(cherry picked from commit 692093fbdc93343dbe500128fdd23167d73036d9)

---

 .pick_status.json                                | 2 +-
 src/gallium/auxiliary/target-helpers/sw_helper.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f7b677d798b..e2a31ee13ad 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -184,7 +184,7 @@
         "description": "zink: confused compilation macro usage for zink in target helpers.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "8d46e35d16e3936968958bcab86d61967a673305"
     },
diff --git a/src/gallium/auxiliary/target-helpers/sw_helper.h b/src/gallium/auxiliary/target-helpers/sw_helper.h
index 2fb1da527cc..e129819477d 100644
--- a/src/gallium/auxiliary/target-helpers/sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/sw_helper.h
@@ -82,7 +82,7 @@ sw_screen_create(struct sw_winsys *winsys)
    default_driver = "softpipe";
 #elif defined(GALLIUM_SWR)
    default_driver = "swr";
-#elif defined(GALLIUM_SWR)
+#elif defined(GALLIUM_ZINK)
    default_driver = "zink";
 #else
    default_driver = "";