From 0bc1942c9ddce4e796322a7561f06af5dec0decd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 23 Apr 2019 21:46:32 -0500 Subject: [PATCH] anv/descriptor_set: Destroy sets before pool finalization Fixes: 105002bd2d "anv: destroy descriptor sets when pool gets..." Reviewed-by: Lionel Landwerlin --- src/intel/vulkan/anv_descriptor_set.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index a1dd8a3527f..882c42f231e 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -745,6 +745,11 @@ void anv_DestroyDescriptorPool( if (!pool) return; + list_for_each_entry_safe(struct anv_descriptor_set, set, + &pool->desc_sets, pool_link) { + anv_descriptor_set_destroy(device, pool, set); + } + if (pool->bo.size) { anv_gem_munmap(pool->bo.map, pool->bo.size); anv_vma_free(device, &pool->bo); @@ -752,11 +757,6 @@ void anv_DestroyDescriptorPool( } anv_state_stream_finish(&pool->surface_state_stream); - list_for_each_entry_safe(struct anv_descriptor_set, set, - &pool->desc_sets, pool_link) { - anv_descriptor_set_destroy(device, pool, set); - } - util_vma_heap_finish(&pool->bo_heap); vk_free2(&device->alloc, pAllocator, pool); -- 2.30.2