From c426ecb276ceeb943b1a94e7bca3a2bb2be8d622 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 20 Jun 2022 11:08:52 -0400 Subject: [PATCH] zink: fix image bind counting these must only be incremented if the image descriptor has changed cc: mesa-stable Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 74dd6e69b44f3301131961af53348c8cb96d844a) --- .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 9e699d99277..a335a0f1ce0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -220,7 +220,7 @@ "description": "zink: fix image bind counting", "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 df8307d0947..4f2c7244393 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1478,12 +1478,12 @@ zink_set_shader_images(struct pipe_context *pctx, if (images[i].access & PIPE_IMAGE_ACCESS_READ) { access |= VK_ACCESS_SHADER_READ_BIT; } - res->image_bind_count[p_stage == PIPE_SHADER_COMPUTE]++; if (images[i].resource->target == PIPE_BUFFER) { struct zink_buffer_view *bv = create_image_bufferview(ctx, &images[i]); assert(bv); if (image_view->buffer_view != bv) { update_res_bind_count(ctx, res, p_stage == PIPE_SHADER_COMPUTE, false); + res->image_bind_count[p_stage == PIPE_SHADER_COMPUTE]++; unbind_shader_image(ctx, p_stage, start_slot + i); } image_view->buffer_view = bv; @@ -1494,6 +1494,7 @@ zink_set_shader_images(struct pipe_context *pctx, struct zink_surface *surface = create_image_surface(ctx, &images[i], p_stage == PIPE_SHADER_COMPUTE); assert(surface); if (image_view->surface != surface) { + res->image_bind_count[p_stage == PIPE_SHADER_COMPUTE]++; update_res_bind_count(ctx, res, p_stage == PIPE_SHADER_COMPUTE, false); unbind_shader_image(ctx, p_stage, start_slot + i); }