summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2019-04-23 21:46:32 -0500
committerDylan Baker <dylan@pnwbakers.com>2019-05-08 16:40:18 -0700
commitc8dbe93b0a35c0cd965f090aff053edb22909f2e (patch)
treef02aae318b84a33d7d48e71d7e8a928010e8775b
parentfa1bbc00a6cf3df7d47b6d7fd3f12e85e560ed37 (diff)
anv/descriptor_set: Destroy sets before pool finalization
Fixes: 105002bd2d "anv: destroy descriptor sets when pool gets..." Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
-rw-r--r--src/intel/vulkan/anv_descriptor_set.c4
1 files 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);
}