Mesa (master): anv: Fix descriptor set clean-up on BO allocation failure

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4151bddab5d3dc082ac689e4d3a96f42fa4718ec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4151bddab5d3dc082ac689e4d3a96f42fa4718ec

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Wed May 13 22:57:46 2020 -0500

anv: Fix descriptor set clean-up on BO allocation failure

This was a bit of rebase fail when writing 682c81bdfb.  We stopped
freeing descriptor sets back to the pool and started calling
vk_object_base_finish.  This commit reverts a that hunk should have
never made its way into the final patch.

Fixes: 682c81bdfb "vulkan,anv: Add a base object struct type"
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5032>

---

 src/intel/vulkan/anv_descriptor_set.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index d51721b22ea..cb6fa40b368 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -951,7 +951,7 @@ anv_descriptor_set_create(struct anv_device *device,
       uint64_t pool_vma_offset =
          util_vma_heap_alloc(&pool->bo_heap, set_buffer_size, 32);
       if (pool_vma_offset == 0) {
-         vk_object_base_finish(&set->base);
+         anv_descriptor_pool_free_set(pool, set);
          return vk_error(VK_ERROR_FRAGMENTED_POOL);
       }
       assert(pool_vma_offset >= POOL_HEAP_OFFSET &&