Mesa (staging/23.3): Revert "zink: Fix crash on zink_create_screen error path"

[GitLab Mirror]

Module: Mesa
Branch: staging/23.3
Commit: 8525297bedea7af83a16b941a999202bd4f84b24
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8525297bedea7af83a16b941a999202bd4f84b24

Author: Eric Engestrom <e...@engestrom.ch>
Date:   Tue Nov  7 13:33:30 2023 +0000

Revert "zink: Fix crash on zink_create_screen error path"

This reverts commit a317466914af5de90924dd8e24ac047c977e9565.

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f6a0ffe269b..7ecca1a569f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1914,7 +1914,7 @@
         "description": "zink: Fix crash on zink_create_screen error path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 1,
+        "resolution": 0,
         "main_sha": null,
         "because_sha": "0c2045553fe4b3f337935cf007ba3920497e51a0",
         "notes": null
diff --git a/src/gallium/drivers/zink/zink_screen.c 
b/src/gallium/drivers/zink/zink_screen.c
index 0edb8d5f35e..74b575ed658 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1520,14 +1520,10 @@ zink_destroy_screen(struct pipe_screen *pscreen)
    if (screen->dev)
       VKSCR(DestroyDevice)(screen->dev, NULL);
 
-   if (screen->instance)
-      VKSCR(DestroyInstance)(screen->instance, NULL);
-
+   VKSCR(DestroyInstance)(screen->instance, NULL);
    util_idalloc_mt_fini(&screen->buffer_ids);
 
-   if (screen->loader_lib)
-      util_dl_close(screen->loader_lib);
-
+   util_dl_close(screen->loader_lib);
    if (screen->drm_fd != -1)
       close(screen->drm_fd);