OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: handle 'blitting' flag better in msrtss replication

Browse Source 
barriers are illegal while 'blitting' is set, so unset it temporarily
for the replication barriers and then also re-set the layouts after

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22577>
This commit is contained in:
Mike Blumenkrantz
2023-03-27 15:50:10 -04:00
committed by Marge Bot
parent ec0860b401
commit 1e7cb4642e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -770,6 +770,7 @@ zink_begin_render_pass(struct zink_context *ctx)
uint32_t rp_state = ctx->gfx_pipeline_state.rp_state; uint32_t rp_state = ctx->gfx_pipeline_state.rp_state;
struct zink_render_pass *rp = ctx->gfx_pipeline_state.render_pass; struct zink_render_pass *rp = ctx->gfx_pipeline_state.render_pass;
struct zink_framebuffer *fb = ctx->framebuffer; struct zink_framebuffer *fb = ctx->framebuffer;
bool blitting = ctx->blitting;
u_foreach_bit(i, ctx->framebuffer->rp->state.msaa_expand_mask) { u_foreach_bit(i, ctx->framebuffer->rp->state.msaa_expand_mask) {
struct zink_ctx_surface *csurf = (struct zink_ctx_surface*)ctx->fb_state.cbufs[i]; struct zink_ctx_surface *csurf = (struct zink_ctx_surface*)ctx->fb_state.cbufs[i];
@@ -788,13 +789,19 @@ zink_begin_render_pass(struct zink_context *ctx)
src_view = ctx->base.create_sampler_view(&ctx->base, src, &src_templ); src_view = ctx->base.create_sampler_view(&ctx->base, src, &src_templ);
zink_blit_begin(ctx, ZINK_BLIT_SAVE_FB | ZINK_BLIT_SAVE_FS | ZINK_BLIT_SAVE_TEXTURES); zink_blit_begin(ctx, ZINK_BLIT_SAVE_FB | ZINK_BLIT_SAVE_FS | ZINK_BLIT_SAVE_TEXTURES);
zink_blit_barriers(ctx, zink_resource(src), zink_resource(dst_view->texture), false); ctx->blitting = false;
zink_blit_barriers(ctx, zink_resource(src), zink_resource(dst_view->texture), true);
ctx->blitting = true; ctx->blitting = true;
util_blitter_blit_generic(ctx->blitter, dst_view, &dstbox, util_blitter_blit_generic(ctx->blitter, dst_view, &dstbox,
src_view, &dstbox, ctx->fb_state.width, ctx->fb_state.height, src_view, &dstbox, ctx->fb_state.width, ctx->fb_state.height,
PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL, PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL,
false, false, 0); false, false, 0);
ctx->blitting = false; ctx->blitting = false;
if (blitting) {
zink_blit_barriers(ctx, NULL, zink_resource(dst_view->texture), true);
zink_blit_barriers(ctx, NULL, zink_resource(src), true);
}
ctx->blitting = blitting;
pipe_sampler_view_reference(&src_view, NULL); pipe_sampler_view_reference(&src_view, NULL);
csurf->transient_init = true; csurf->transient_init = true;
} }