summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2019-04-23 21:46:32 -0500
committerJason Ekstrand <[email protected]>2019-04-24 05:40:27 +0000
commit0bc1942c9ddce4e796322a7561f06af5dec0decd (patch)
tree8aca8c8c9f77c0a39c1416aadb789aeaabbb2529
parent6be603edf7e2bd6ac7bc7a4e15152b8f0d0ee729 (diff)
anv/descriptor_set: Destroy sets before pool finalization
Fixes: 105002bd2d "anv: destroy descriptor sets when pool gets..." Reviewed-by: Lionel Landwerlin <[email protected]>
-rw-r--r--src/intel/vulkan/anv_descriptor_set.c10
1 files 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);