From ae3d046039dc2156a18b39923ada8db857784d94 Mon Sep 17 00:00:00 2001 From: luc <814640709@qq.com> Date: Sat, 15 Feb 2020 12:55:16 +0800 Subject: zink: confused compilation macro usage for zink in target helpers. Fixes: 8d46e35d16e ("zink: introduce opengl over vulkan") Reviewed-by: Erik Faye-Lund Tested-by: Marge Bot Part-of: (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 2b9063a6fad..a977a7cc3a3 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 = ""; -- cgit v1.2.3