diff --git a/.pick_status.json b/.pick_status.json index e6c65c9a96f..0b2099f71b7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -859,7 +859,7 @@ "description": "zink: don't append msrtss to dynamic render if not supported", "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 8c10afe69d0..8b2377aca20 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -2790,7 +2790,8 @@ begin_rendering(struct zink_context *ctx) ctx->gfx_pipeline_state.rast_samples + 1, }; - ctx->dynamic_fb.info.pNext = ctx->transient_attachments ? &msrtss : NULL; + if (zink_screen(ctx->base.screen)->info.have_EXT_multisampled_render_to_single_sampled) + ctx->dynamic_fb.info.pNext = ctx->transient_attachments ? &msrtss : NULL; assert(!ctx->transient_attachments || msrtss.rasterizationSamples != VK_SAMPLE_COUNT_1_BIT); VKCTX(CmdBeginRendering)(ctx->batch.state->cmdbuf, &ctx->dynamic_fb.info); ctx->batch.in_rp = true;