From 190eab9675527e42599bdcae1a2e06f2bb2693bc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 16 Oct 2025 22:21:38 -0400 Subject: [PATCH] zink: consistently set/unset msrtss in begin_rendering this has to always be set or unset, never persistent from previous renderpass Fixes: 5080f2b6f55 ("zink: disable msrtss handling when blitting") Part-of: (cherry picked from commit f74cf450782509d9e386a83a3f8221a3d1bdb701) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_context.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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;