fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 09:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: only add fb surf refs on unbind

Browse source 
this only applies to cases where a fb state persists across cmdbufs,
but it's consistent with how other resource binds work

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33849>
This commit is contained in:
Mike Blumenkrantz 2025-02-14 10:33:42 -05:00 • committed by Marge Bot
parent c32e67e0d9
commit 2c6837260e
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/zink/zink_context.c
View file

@ -3183,11 +3183,6 @@ zink_batch_rp(struct zink_context *ctx)
if (ctx->render_condition.query)
zink_start_conditional_render(ctx);
zink_clear_framebuffer(ctx, clear_buffers);
if (ctx->pipeline_changed[0]) {
for (unsigned i = 0; i < ctx->fb_state.nr_cbufs; i++)
batch_ref_fb_surface(ctx, ctx->fb_state.cbufs[i]);
batch_ref_fb_surface(ctx, ctx->fb_state.zsbuf);
}
}
/* unable to previously determine that queries didn't split renderpasses: ensure queries start inside renderpass */
if (!ctx->queries_disabled && maybe_has_query_ends) {
@ -3665,6 +3660,7 @@ unbind_fb_surface(struct zink_context *ctx, struct pipe_surface *surf, unsigned
}
}
res->fb_binds &= ~BITFIELD_BIT(idx);
batch_ref_fb_surface(ctx, surf);
/* this is called just before the resource loses a reference, so a refcount==1 means the resource will be destroyed */
if (!res->fb_bind_count && res->base.b.reference.count > 1) {
if (ctx->track_renderpasses && !ctx->blitting) {
@ -3863,7 +3859,6 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
}
res->fb_bind_count++;
res->fb_binds |= BITFIELD_BIT(i);
batch_ref_fb_surface(ctx, ctx->fb_state.cbufs[i]);
if (util_format_has_alpha1(psurf->format)) {
if (!res->valid && !zink_fb_clear_full_exists(ctx, i))
ctx->void_clears |= (PIPE_CLEAR_COLOR0 << i);
@ -3875,7 +3870,6 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
struct pipe_surface *psurf = ctx->fb_state.zsbuf;
struct zink_surface *transient = zink_transient_surface(psurf);
check_framebuffer_surface_mutable(pctx, psurf);
batch_ref_fb_surface(ctx, ctx->fb_state.zsbuf);
if (transient || psurf->nr_samples)
ctx->transient_attachments |= BITFIELD_BIT(PIPE_MAX_COLOR_BUFS);
if (!samples)