From c8dbe93b0a35c0cd965f090aff053edb22909f2e 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index 5bb5d5d85fa..0259abea0bf 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -479,13 +479,13 @@ void anv_DestroyDescriptorPool( if (!pool) return; - 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); } + anv_state_stream_finish(&pool->surface_state_stream); + vk_free2(&device->alloc, pAllocator, pool); }