From f2b4378a5ed5ed249d29b3e0cc7c634c497de53f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 15 Feb 2023 14:34:23 -0500
Subject: [PATCH] zink: fix descriptor update flagging on null ssbo set

this could unset the update flag if the last ssbo was null, which would
be a bug if it could ever be triggered

found by inspection

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21739>
(cherry picked from commit 7145ccfa0596a2c4adb707f657161fe3ba5e09af)
---
 .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 39932d22628..53893a4ae19 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3280,7 +3280,7 @@
         "description": "zink: fix descriptor update flagging on null ssbo set",
         "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 7ce0d2f9c73..af24d6f52d7 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1561,7 +1561,8 @@ zink_set_shader_buffers(struct pipe_context *pctx,
          else
             new_res->obj->unordered_read = false;
       } else {
-         update = !!res;
+         if (res)
+            update = true;
          ssbo->buffer_offset = 0;
          ssbo->buffer_size = 0;
          if (res) {