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 eed3007588)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40488>
This commit is contained in:
Mike Blumenkrantz 2026-03-11 11:30:49 -04:00 committed by Eric Engestrom
parent 58950e2d06
commit d4465aad0b
2 changed files with 2 additions and 2 deletions

View file

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

View file

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