fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: avoid recursion during msrtss blits from flushing clears

Browse source 
if an attachment other than the msrtss blit attachment has clears pending,
unbinding the other attachment will trigger a clear flush, which will then
recurse into the msrtss blit that's being triggered

instead, save/restore these clears around the msrtss blit since they
can be executed during the normal renderpass

(cherry picked from commit 82add9f2e9)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22598>
This commit is contained in:
Mike Blumenkrantz 2023-03-28 09:47:45 -04:00 • committed by Eric Engestrom
parent 839320beaa
commit c39e3319ca
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -112,7 +112,7 @@
"description": "zink: avoid recursion during msrtss blits from flushing clears",
"nominated": false,
"nomination_type": null,
"resolution": 4,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

9
src/gallium/drivers/zink/zink_render_pass.c
View file

@ -797,10 +797,19 @@ zink_begin_render_pass(struct zink_context *ctx)
ctx->blitting = false;
zink_blit_barriers(ctx, zink_resource(src), zink_resource(dst_view->texture), true);
ctx->blitting = true;
unsigned clear_mask = i == PIPE_MAX_COLOR_BUFS ?
(BITFIELD_MASK(PIPE_MAX_COLOR_BUFS) << 2) :
(PIPE_CLEAR_DEPTHSTENCIL | ((BITFIELD_MASK(PIPE_MAX_COLOR_BUFS) & ~BITFIELD_BIT(i)) << 2));
unsigned clears_enabled = ctx->clears_enabled & clear_mask;
unsigned rp_clears_enabled = ctx->rp_clears_enabled & clear_mask;
ctx->clears_enabled &= ~clear_mask;
ctx->rp_clears_enabled &= ~clear_mask;
util_blitter_blit_generic(ctx->blitter, dst_view, &dstbox,
src_view, &dstbox, ctx->fb_state.width, ctx->fb_state.height,
PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL,
false, false, 0);
ctx->clears_enabled = clears_enabled;
ctx->rp_clears_enabled = rp_clears_enabled;
ctx->blitting = false;
if (blitting) {
zink_blit_barriers(ctx, NULL, zink_resource(dst_view->texture), true);