Mesa (main): d3d12: Only destroy the winsys during screen destruction, not reset

[GitLab Mirror]

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

Author: Jesse Natalie <jenat...@microsoft.com>
Date:   Mon Dec 18 10:44:25 2023 -0800

d3d12: Only destroy the winsys during screen destruction, not reset

Fixes: 81c8e89f ("d3d12: Fix screen->winsys leak in d3d12_screen")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26744>

---

 src/gallium/drivers/d3d12/d3d12_screen.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp 
b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index bb3e3a2e3cb..f17b3fdc4e7 100644
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -766,15 +766,15 @@ d3d12_deinit_screen(struct d3d12_screen *screen)
       screen->dev->Release();
       screen->dev = nullptr;
    }
-   if (screen->winsys) {
-      screen->winsys->destroy(screen->winsys);
-      screen->winsys = nullptr;
-   }
 }
 
 void
 d3d12_destroy_screen(struct d3d12_screen *screen)
 {
+   if (screen->winsys) {
+      screen->winsys->destroy(screen->winsys);
+      screen->winsys = nullptr;
+   }
    slab_destroy_parent(&screen->transfer_pool);
    mtx_destroy(&screen->submit_mutex);
    mtx_destroy(&screen->descriptor_pool_mutex);