From 9ed54537c4f1179fd0a467dc72b971a55299c504 Mon Sep 17 00:00:00 2001 From: SoroushIMG Date: Mon, 13 Feb 2023 14:38:26 +0000 Subject: [PATCH] zink: free resource objects' views array during destruction since the array is not ralloc managed, it has be explicitly freed. cc: mesa-stable Part-of: (cherry picked from commit 96849363eba081321176f8ad3ce303677a531eae) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 97b295a8100..7001aa092c2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -283,7 +283,7 @@ "description": "zink: free resource objects' views array during destruction", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 0ca74892296..56f445f63d2 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -105,6 +105,7 @@ zink_destroy_resource_object(struct zink_screen *screen, struct zink_resource_ob while (util_dynarray_contains(&obj->views, VkImageView)) VKSCR(DestroyImageView)(screen->dev, util_dynarray_pop(&obj->views, VkImageView), NULL); } + util_dynarray_fini(&obj->views); if (obj->is_buffer) { VKSCR(DestroyBuffer)(screen->dev, obj->buffer, NULL); VKSCR(DestroyBuffer)(screen->dev, obj->storage_buffer, NULL);