From d4465aad0b8b18f5aa41d681ea768516b5a81ac8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 11 Mar 2026 11:30:49 -0400 Subject: [PATCH] zink: allow renderpass termination for clears with ZINK_DEBUG=rp and GENERAL layouts this doesn't require a layout change cc: mesa-stable (cherry picked from commit eed30075888c3f1ed67606d6527c7ceba5ee064d) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_clear.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 00b96f694f1..8592d24dcf2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1974,7 +1974,7 @@ "description": "zink: allow renderpass termination for clears with ZINK_DEBUG=rp and GENERAL layouts", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c index e4048fd755a..b030017d433 100644 --- a/src/gallium/drivers/zink/zink_clear.c +++ b/src/gallium/drivers/zink/zink_clear.c @@ -204,7 +204,7 @@ zink_clear(struct pipe_context *pctx, if (ctx->in_rp) { if (buffers & PIPE_CLEAR_DEPTHSTENCIL && (ctx->zsbuf_unused || ctx->zsbuf_readonly)) { /* this will need a layout change */ - assert(!ctx->track_renderpasses); + assert(!ctx->track_renderpasses || screen->driver_workarounds.general_layout); zink_batch_no_rp(ctx); } else { clear_in_rp(pctx, buffers, scissor_state, pcolor, depth, stencil);