From 3d33c13eca2ef2e643020d3d1b27b96ae2e770e5 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 23 Apr 2019 21:35:30 -0500 Subject: anv/descriptor_set: Only vma_heap_finish if we have a descriptor buffer Fixes: 7bb34ecff98 "anv: release memory allocated by bo_heap when..." Reviewed-by: Lionel Landwerlin --- src/intel/vulkan/anv_descriptor_set.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index 882c42f231e..2d4d37febb5 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -754,11 +754,10 @@ void anv_DestroyDescriptorPool( anv_gem_munmap(pool->bo.map, pool->bo.size); anv_vma_free(device, &pool->bo); anv_gem_close(device, pool->bo.gem_handle); + util_vma_heap_finish(&pool->bo_heap); } anv_state_stream_finish(&pool->surface_state_stream); - util_vma_heap_finish(&pool->bo_heap); - vk_free2(&device->alloc, pAllocator, pool); } -- cgit v1.2.3