From 0b675ef7a373e352f68b39aa9537e8b5942cb68a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 6 Jun 2022 15:11:30 +1000
Subject: [PATCH] nvk: descriptor set freeing fix

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_descriptor_set.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_descriptor_set.c b/src/nouveau/vulkan/nvk_descriptor_set.c
index 0458632..bac6c63 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set.c
+++ b/src/nouveau/vulkan/nvk_descriptor_set.c
@@ -178,6 +178,17 @@ static void
 nvk_descriptor_set_destroy(struct nvk_device *device, struct nvk_descriptor_pool *pool,
                            struct nvk_descriptor_set *set, bool free_bo)
 {
+   if (free_bo) {
+      for (int i = 0; i < pool->entry_count; ++i) {
+         if (pool->entries[i].set == set) {
+            memmove(&pool->entries[i], &pool->entries[i + 1],
+                    sizeof(pool->entries[i]) * (pool->entry_count - i - 1));
+            --pool->entry_count;
+            break;
+         }
+      }
+   }
+
    vk_object_base_finish(&set->base);
    vk_free2(&device->vk.alloc, NULL, set);
 }
-- 
2.7.4