From aec938b1f8c99c5237912c27a4ec3eef876dfd61 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 11 Apr 2023 14:26:20 -0400 Subject: [PATCH] zink: remove redundant 'blitting' check in zink_prep_fb_attachment() this is a return conditional 2 lines above Part-of: --- src/gallium/drivers/zink/zink_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index b9ba42d0c7a..5206c259c7c 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -2930,7 +2930,7 @@ zink_prep_fb_attachment(struct zink_context *ctx, struct zink_surface *surf, uns if (ctx->blitting) return surf->image_view; VkImageLayout layout; - if (ctx->track_renderpasses && !ctx->blitting) { + if (ctx->track_renderpasses) { layout = zink_tc_renderpass_info_parse(ctx, &ctx->dynamic_fb.tc_info, i < ctx->fb_state.nr_cbufs ? i : PIPE_MAX_COLOR_BUFS, &pipeline, &access); assert(i < ctx->fb_state.nr_cbufs || layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL || !zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS)); if (i == ctx->fb_state.nr_cbufs && zink_fb_clear_enabled(ctx, PIPE_MAX_COLOR_BUFS))