Mesa (staging/20.3): zink: fail if set failed to create

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: bd7ccbf214de8f92c447969683c3f84e8469c5f4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd7ccbf214de8f92c447969683c3f84e8469c5f4

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Dec  8 12:45:23 2020 +0100

zink: fail if set failed to create

Fixes: a03d17ede77 ("zink: refcount zink_gfx_program objects")

Acked-by: Adam Jackson <ajax at redhat.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7985>
(cherry picked from commit 8a30ac49ac72275d4b123807fceb175658203f95)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 4fdb5c609d1..c3b541929f5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
         "description": "zink: fail if set failed to create",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a03d17ede778610f2c66099d0d5342cf09ef12a2"
     },
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index ab3884522ca..2f01fa74acd 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1304,7 +1304,8 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
                                                   _mesa_hash_pointer,
                                                   _mesa_key_pointer_equal);
 
-      if (!ctx->batches[i].resources || !ctx->batches[i].sampler_views)
+      if (!ctx->batches[i].resources || !ctx->batches[i].sampler_views ||
+          !ctx->batches[i].programs)
          goto fail;
 
       util_dynarray_init(&ctx->batches[i].zombie_samplers, NULL);