Revert "d3d12: Fix screen->winsys leak in d3d12_screen"

This reverts commit 81c8e89ff8e846839fffc1d103b2080bef5c1b5c.

Fixes: 81c8e89ff8e ("d3d12: Fix screen->winsys leak in d3d12_screen")
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26872>
(cherry picked from commit e11605321aaf94e537751b09f3ec5133c385cc83)

diff --git a/.pick_status.json b/.pick_status.json
index 0cc643f..e934835 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -144,7 +144,7 @@
         "description": "Revert \"d3d12: Fix screen->winsys leak in d3d12_screen\"",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "81c8e89ff8e846839fffc1d103b2080bef5c1b5c",
         "notes": null

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