Mesa (staging/22.0): zink: create pipeline layout if only bindless descriptor set is used

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 8add1f57d16e94349aabbe3f530828b84736b594
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8add1f57d16e94349aabbe3f530828b84736b594

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Apr 11 15:07:50 2022 -0400

zink: create pipeline layout if only bindless descriptor set is used

bindless descriptors are descriptors too.

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15853>
(cherry picked from commit d637eee212cc27bc35fe784aeee2d33105c36a34)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 674f324f13c..4a114be3745 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -740,7 +740,7 @@
         "description": "zink: create pipeline layout if only bindless descriptor set is used",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": null
     },
     {
diff --git a/src/gallium/drivers/zink/zink_descriptors_lazy.c b/src/gallium/drivers/zink/zink_descriptors_lazy.c
index 398c4f06fac..97c983d7b34 100644
--- a/src/gallium/drivers/zink/zink_descriptors_lazy.c
+++ b/src/gallium/drivers/zink/zink_descriptors_lazy.c
@@ -232,7 +232,7 @@ zink_descriptor_program_init_lazy(struct zink_context *ctx, struct zink_program
    if (pg->dd->bindless)
       zink_descriptors_init_bindless(ctx);
    pg->dd->binding_usage = has_bindings;
-   if (!has_bindings && !push_count) {
+   if (!has_bindings && !push_count && !pg->dd->bindless) {
       ralloc_free(pg->dd);
       pg->dd = NULL;