zink: consistently set/unset msrtss in begin_rendering

this has to always be set or unset, never persistent from previous renderpass

Fixes: 5080f2b6f5 ("zink: disable msrtss handling when blitting")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37923>
(cherry picked from commit f74cf45078)
This commit is contained in:
Mike Blumenkrantz 2025-10-16 22:21:38 -04:00 committed by Eric Engestrom
parent ebcd616b71
commit 190eab9675
2 changed files with 2 additions and 3 deletions

View file

@ -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

View file

@ -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;