Mesa (staging/22.1): zink: fix up KILL to a more sensible log message

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jun 13 15:19:30 2022 -0400

zink: fix up KILL to a more sensible log message

cc: mesa-stable

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17009>
(cherry picked from commit 399104f0498575f70cf0e8c369e8b888cfd70881)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_kopper.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index e3c6a9317f9..0c7fbf5b561 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1732,7 +1732,7 @@
         "description": "zink: fix up KILL to a more sensible log message",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c
index 0a68a6158cc..e6d5156d1d3 100644
--- a/src/gallium/drivers/zink/zink_kopper.c
+++ b/src/gallium/drivers/zink/zink_kopper.c
@@ -516,7 +516,7 @@ kill_swapchain(struct zink_context *ctx, struct zink_resource *res)
 {
    struct zink_screen *screen = zink_screen(ctx->base.screen);
    /* dead swapchain */
-   fprintf(stderr, "KILL %p\n", res);
+   mesa_loge("zink: swapchain killed %p\n", res);
    zink_batch_reference_resource(&ctx->batch, res);
    struct pipe_resource *pres = screen->base.resource_create(&screen->base, &res->base.b);
    zink_resource_object_reference(screen, &res->obj, zink_resource(pres)->obj);