d3d12: Fix screen->winsys leak in d3d12_screen

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26456>
(cherry picked from commit 81c8e89ff8e846839fffc1d103b2080bef5c1b5c)

diff --git a/.pick_status.json b/.pick_status.json
index 4e06969..ce9fcb9 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2524,7 +2524,7 @@
         "description": "d3d12: Fix screen->winsys leak in d3d12_screen",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null

diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index 4377361..192d4d9 100644 (file)
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -735,6 +735,10 @@ 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