From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 9 Mar 2023 12:51:16 +0000 (-0500)
Subject: zink: handle swapchain creation failure less lazily
X-Git-Tag: upstream/23.3.3~11356
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca43ecefa48a6c4ab38760de001ad28b6cb8f745;p=platform%2Fupstream%2Fmesa.git

zink: handle swapchain creation failure less lazily

this is a real scenario

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22027>
---

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index c379a67..cf4e5ab 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -1250,7 +1250,13 @@ resource_create(struct pipe_screen *pscreen,
                                                          templ->height0,
                                                          64, loader_private,
                                                          &res->dt_stride);
-         assert(res->obj->dt);
+         if (!res->obj->dt) {
+            mesa_loge("zink: could not create swapchain");
+            FREE(res->obj);
+            free(res->modifiers);
+            FREE_CL(res);
+            return NULL;
+         }
       } else {
          /* frontbuffer */
          struct zink_resource *back = (void*)loader_private;