anv/descriptor_set: Only vma_heap_finish if we have a descriptor buffer
authorJason Ekstrand <jason@jlekstrand.net>
Wed, 24 Apr 2019 02:35:30 +0000 (21:35 -0500)
committerJason Ekstrand <jason@jlekstrand.net>
Wed, 24 Apr 2019 05:40:27 +0000 (05:40 +0000)
Fixes: 7bb34ecff98 "anv: release memory allocated by bo_heap when..."
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
src/intel/vulkan/anv_descriptor_set.c

index 882c42f231e6955dc7408903e00661fe677c9d37..2d4d37febb5ca9d67decba879dd50b9252403132 100644 (file)
@@ -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);
       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);
 
    }
    anv_state_stream_finish(&pool->surface_state_stream);
 
-   util_vma_heap_finish(&pool->bo_heap);
-
    vk_free2(&device->alloc, pAllocator, pool);
 }
 
    vk_free2(&device->alloc, pAllocator, pool);
 }