Module: Mesa Branch: staging/23.0 Commit: 1301e568674e2d247bda74280c312604e57b7906 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1301e568674e2d247bda74280c312604e57b7906
Author: Lionel Landwerlin <[email protected]> Date: Fri Feb 17 16:34:10 2023 +0200 anv: fix vma heap memory leak Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: a5f9e59ce3 ("anv: Use vma_heap for descriptor pool host allocation") Reviewed-by: José Roberto de Souza <[email protected]> Reviewed-by: Faith Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21385> (cherry picked from commit 3b037ac07361ec5c09e4ec3350840975ea5bf28a) Conflicts: src/intel/vulkan/anv_descriptor_set.c --- .pick_status.json | 2 +- src/intel/vulkan/anv_descriptor_set.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 6e69a5ca9e1..709aa7c38db 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5188,7 +5188,7 @@ "description": "anv: fix vma heap memory leak", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a5f9e59ce357c2974a97004d943aae92ad6f5004" }, diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index fa0e9924ac6..080b89cd997 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -968,6 +968,8 @@ void anv_DestroyDescriptorPool( anv_descriptor_set_layout_unref(device, set->layout); } + util_vma_heap_finish(&pool->host_heap); + if (pool->bo) { util_vma_heap_finish(&pool->bo_heap); anv_device_release_bo(device, pool->bo);
