Mesa (staging/19.0): anv: Fix destroying descriptor sets when pool gets reset

[GitLab Mirror]

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

Author: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Date:   Tue Mar 12 17:13:47 2019 +0200

anv: Fix destroying descriptor sets when pool gets reset

pool->next and pool->free_list were reset before their usage in
anv_descriptor_pool_free_set

Fixes: 775aabdd "anv: destroy descriptor sets when pool gets reset"
Signed-off-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
(cherry picked from commit 9c80be956fff4d4786a9b77c6b9d3fec67ff2377)

---

 src/intel/vulkan/anv_descriptor_set.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index 3e85aaaafd0..26fb9c9169a 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -497,15 +497,14 @@ VkResult anv_ResetDescriptorPool(
    ANV_FROM_HANDLE(anv_device, device, _device);
    ANV_FROM_HANDLE(anv_descriptor_pool, pool, descriptorPool);
 
-   pool->next = 0;
-   pool->free_list = EMPTY;
-   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);
    }
 
+   pool->next = 0;
+   pool->free_list = EMPTY;
+   anv_state_stream_finish(&pool->surface_state_stream);
    anv_state_stream_init(&pool->surface_state_stream,
                          &device->surface_state_pool, 4096);
    pool->surface_state_free_list = NULL;