Mesa (staging/22.1): zink: simplify dumb update flagging in set_shader_images

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 308af4a479b2d8526a45ac3187cb364d5a5fd87f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=308af4a479b2d8526a45ac3187cb364d5a5fd87f

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 13 11:23:10 2022 -0400

zink: simplify dumb update flagging in set_shader_images

cc: mesa-stable

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

---

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

diff --git a/.pick_status.json b/.pick_status.json
index a21b2c811ae..a5f9e4d405b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -562,7 +562,7 @@
         "description": "zink: simplify dumb update flagging in set_shader_images",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 000fe788fd2..fef3d643dbe 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1500,7 +1500,7 @@ zink_set_shader_images(struct pipe_context *pctx,
          update = true;
          update_descriptor_state_image(ctx, p_stage, start_slot + i, res);
       } else if (image_view->base.resource) {
-         update |= !!image_view->base.resource;
+         update = true;
 
          unbind_shader_image(ctx, p_stage, start_slot + i);
          update_descriptor_state_image(ctx, p_stage, start_slot + i, NULL);