Mesa (staging/20.3): zink: dot leak dummy_buffer

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 9000c044fbdf5317e3a4134f8ac8b8742a4fd155
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9000c044fbdf5317e3a4134f8ac8b8742a4fd155

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Dec 15 10:39:46 2020 +0100

zink: dot leak dummy_buffer

Fixes: 8736ffae2ed ("zink: replace unset buffer with a dummy-buffer")

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8099>
(cherry picked from commit 07d5d911dd6c7d36fdd678f289d3babdde634406)

Conflicts:
	src/gallium/drivers/zink/zink_context.c

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/zink/zink_context.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 527ea5f769f..45041010a4d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -814,7 +814,7 @@
         "description": "zink: dot leak dummy_buffer",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "8736ffae2eda9de1ac49200ef399170b428b9f8c"
     },
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 2f01fa74acd..67465b862d4 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -59,6 +59,7 @@ zink_context_destroy(struct pipe_context *pctx)
    if (vkQueueWaitIdle(ctx->queue) != VK_SUCCESS)
       debug_printf("vkQueueWaitIdle failed\n");
 
+   pipe_resource_reference(&ctx->dummy_buffer, NULL);
    for (unsigned i = 0; i < ARRAY_SIZE(ctx->null_buffers); i++)
       pipe_resource_reference(&ctx->null_buffers[i], NULL);