diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2023-02-15 14:34:23 -0500 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-03-08 18:00:16 +0000 |
| commit | ce2dba376a7760a923e106d1fe1588c051dcb33f (patch) | |
| tree | 54634c670815a632f403f4f3563be708b1d15df1 | |
| parent | bd0217cace3f0cd715fb7e4a64c0316a498a1165 (diff) | |
| download | mesa-ce2dba376a7760a923e106d1fe1588c051dcb33f.tar.gz | |
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)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 f1168bb1345..2be24622384 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1201,7 +1201,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 452ac0a16fc..dd35868076a 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1524,7 +1524,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) { |