Mesa (staging/21.3): zink: don't update lazy descriptor states in hybrid mode

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 865d1168e8a677a85fbc20154ea9afc6e0ea7a0b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=865d1168e8a677a85fbc20154ea9afc6e0ea7a0b

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Oct 13 09:16:35 2021 -0400

zink: don't update lazy descriptor states in hybrid mode

I'm not 100% sure how, but this breaks tomb raider

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

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 1540a661c14..df488240bd5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1219,7 +1219,7 @@
         "description": "zink: don't update lazy descriptor states in hybrid mode",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_descriptors_lazy.c b/src/gallium/drivers/zink/zink_descriptors_lazy.c
index ad922dc1cd7..b4b5988cd5f 100644
--- a/src/gallium/drivers/zink/zink_descriptors_lazy.c
+++ b/src/gallium/drivers/zink/zink_descriptors_lazy.c
@@ -536,9 +536,6 @@ zink_descriptors_update_lazy_masked(struct zink_context *ctx, bool is_compute, u
          dd_lazy(ctx)->push_state_changed[is_compute] = false;
       }
    }
-   bdd->pg[is_compute] = pg;
-   ctx->dd->pg[is_compute] = pg;
-   bdd->compat_id[is_compute] = pg->compat_id;
 }
 
 void
@@ -581,6 +578,9 @@ zink_descriptors_update_lazy(struct zink_context *ctx, bool is_compute)
                                    0, NULL);
       ctx->dd->bindless_bound = true;
    }
+   bdd->pg[is_compute] = pg;
+   ctx->dd->pg[is_compute] = pg;
+   bdd->compat_id[is_compute] = pg->compat_id;
 }
 
 void