From 507ace17b9e0df9b61a58f1aba0179b717363f50 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 13 May 2022 11:23:10 -0400 Subject: [PATCH] zink: simplify dumb update flagging in set_shader_images cc: mesa-stable Reviewed-by: Dave Airlie Part-of: (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 9122bf5f2cf..adb8913341f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -500,7 +500,7 @@ "description": "zink: simplify dumb update flagging in set_shader_images", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "because_sha": null }, { diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 0a961cd7e4c..509a915993f 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1418,7 +1418,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);