Mesa (staging/19.0): anv/descriptor_set: Destroy sets before pool finalization

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: a9bb28d20a3b0920460f47df4eecd6f02246e891
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9bb28d20a3b0920460f47df4eecd6f02246e891

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Apr 23 21:46:32 2019 -0500

anv/descriptor_set: Destroy sets before pool finalization

Fixes: 105002bd2d "anv: destroy descriptor sets when pool gets..."
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 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);
 }