Mesa (main): d3d12: Destroy empty residency bo set during early-return

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 2505afc430c6b151e7e4243503953ba0b0a2c842
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2505afc430c6b151e7e4243503953ba0b0a2c842

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Wed Apr 27 15:27:44 2022 -0700

d3d12: Destroy empty residency bo set during early-return

Reviewed-by: Sil Vilerino <sivileri at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16182>

---

 src/gallium/drivers/d3d12/d3d12_residency.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_residency.cpp b/src/gallium/drivers/d3d12/d3d12_residency.cpp
index b3b0934e7ee..be110ba5307 100644
--- a/src/gallium/drivers/d3d12/d3d12_residency.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_residency.cpp
@@ -168,8 +168,10 @@ d3d12_process_batch_residency(struct d3d12_screen *screen, struct d3d12_batch *b
    evict_aged_allocations(screen, completed_fence_value, current_time, grace_period);
 
    /* If there's nothing needing to be made newly resident, we're done once we've trimmed */
-   if (base_bo_set->entries == 0)
+   if (base_bo_set->entries == 0) {
+      _mesa_set_destroy(base_bo_set, nullptr);
       return;
+   }
 
    uint64_t residency_fence_value_snapshot = screen->residency_fence_value;