zink: deallocate global_bindings array

Fixes: a6e9e0f0d77 ("zink: add set_global_binding")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25937>
(cherry picked from commit 2f34a1db5883a2e5178371d8295f711bd754a1e1)

diff --git a/.pick_status.json b/.pick_status.json
index 9540226d76bcef507ddac2883ce3922a6f462a38..81fcd593d0adc225c8d526e73f7f42d986fb41af 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -264,7 +264,7 @@
         "description": "zink: deallocate global_bindings array",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a6e9e0f0d771e5121ea477cbaabe65a38de0ce5d",
         "notes": null

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index f8e742fc9cfeed217f5efab2c2c7000c4b3dd61e..39494ad1a14a44cc6f50137c746752505f127be6 100644 (file)
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -231,6 +231,11 @@ zink_context_destroy(struct pipe_context *pctx)
    if (!(ctx->flags & ZINK_CONTEXT_COPY_ONLY))
       p_atomic_dec(&screen->base.num_contexts);
 
+   util_dynarray_foreach(&ctx->di.global_bindings, struct pipe_resource *, res) {
+      pipe_resource_reference(res, NULL);
+   }
+   util_dynarray_fini(&ctx->di.global_bindings);
+
    ralloc_free(ctx);
 }