From ed343b415ec35357abc5a58355b0b306b0747e2e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 22 Mar 2022 15:28:44 -0400 Subject: [PATCH] zink: pass index to unbind_fb_surface Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index dbf65135261..5164d0a822e 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -2575,7 +2575,7 @@ rebind_fb_state(struct zink_context *ctx, struct zink_resource *match_res, bool } static void -unbind_fb_surface(struct zink_context *ctx, struct pipe_surface *surf, bool changed) +unbind_fb_surface(struct zink_context *ctx, struct pipe_surface *surf, unsigned idx, bool changed) { if (!surf) return; @@ -2626,13 +2626,13 @@ zink_set_framebuffer_state(struct pipe_context *pctx, struct pipe_surface *surf = ctx->fb_state.cbufs[i]; if (i < state->nr_cbufs) ctx->rp_changed |= !!zink_transient_surface(surf) != !!zink_transient_surface(state->cbufs[i]); - unbind_fb_surface(ctx, surf, i >= state->nr_cbufs || surf != state->cbufs[i]); + unbind_fb_surface(ctx, surf, i, i >= state->nr_cbufs || surf != state->cbufs[i]); } if (ctx->fb_state.zsbuf) { struct pipe_surface *surf = ctx->fb_state.zsbuf; struct zink_resource *res = zink_resource(surf->texture); bool changed = surf != state->zsbuf; - unbind_fb_surface(ctx, surf, changed); + unbind_fb_surface(ctx, surf, PIPE_MAX_COLOR_BUFS, changed); if (!changed) ctx->rp_changed |= !!zink_transient_surface(surf) != !!zink_transient_surface(state->zsbuf); if (changed && unlikely(res->obj->needs_zs_evaluate))