diff --git a/.pick_status.json b/.pick_status.json index d0637544b1a..3f01a0f2cdb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5024,7 +5024,7 @@ "description": "zink: consistently set/unset msrtss in begin_rendering", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5080f2b6f552875818229c4810e0221e9264e9b4", "notes": null diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index a41669f66ab..46b66ccdbef 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3233,9 +3233,8 @@ begin_rendering(struct zink_context *ctx, bool check_msaa_expand) VK_TRUE, ctx->gfx_pipeline_state.rast_samples + 1, }; + ctx->dynamic_fb.info.pNext = ctx->transient_attachments && !ctx->blitting && has_msrtss ? &msrtss : NULL; - if (has_msrtss && !ctx->blitting) - ctx->dynamic_fb.info.pNext = ctx->transient_attachments ? &msrtss : NULL; VKCTX(CmdBeginRendering)(ctx->bs->cmdbuf, &ctx->dynamic_fb.info); ctx->in_rp = true; return clear_buffers;