Mesa (staging/21.3): zink: stop double printing validation messages

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 13426be49c6817e798e73be47cb4ee6e07422c9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13426be49c6817e798e73be47cb4ee6e07422c9d

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Nov  1 10:58:35 2021 -0400

zink: stop double printing validation messages

VVL already prints its messages using configurable settings. there's no
reason for zink to unconditionally repeat them immediately after

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13633>
(cherry picked from commit ac2af149f1099bcd910de6d625374cb545d66ff8)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4983ee287fb..28c907ae4ac 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -211,7 +211,7 @@
         "description": "zink: stop double printing validation messages",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 21ea1acff41..58a147fa172 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1375,25 +1375,21 @@ check_have_device_time(struct zink_screen *screen)
 static void
 zink_error(const char *msg)
 {
-   fprintf(stderr, "zink ERR: '%s'\n", msg);
 }
 
 static void
 zink_warn(const char *msg)
 {
-   fprintf(stderr, "zink WRN: '%s'\n", msg);
 }
 
 static void
 zink_info(const char *msg)
 {
-   fprintf(stderr, "zink NFO: '%s'\n", msg);
 }
 
 static void
 zink_msg(const char *msg)
 {
-   fprintf(stderr, "zink MSG: '%s'\n", msg);
 }
 
 static VKAPI_ATTR VkBool32 VKAPI_CALL