Mesa (main): zink: remove fb surface refs

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e03d15141b1387e89a83ad480577826e21208d6f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e03d15141b1387e89a83ad480577826e21208d6f

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue May 11 09:24:26 2021 -0400

zink: remove fb surface refs

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11692>

---

 src/gallium/drivers/zink/zink_context.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 634ea775a9d..055201a7a74 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1687,7 +1687,6 @@ begin_render_pass(struct zink_context *ctx)
       if (ctx->framebuffer->surfaces[i]) {
          struct zink_surface *surf = zink_surface(ctx->framebuffer->surfaces[i]);
          zink_batch_reference_resource_rw(batch, zink_resource(surf->base.texture), true);
-         zink_batch_reference_surface(batch, surf);
          zink_batch_usage_set(&surf->batch_uses, batch->state);
 
          struct zink_resource *res = zink_resource(surf->base.texture);
@@ -1946,6 +1945,8 @@ unbind_fb_surface(struct zink_context *ctx, struct pipe_surface *surf, bool chan
       return;
    if (changed) {
       zink_fb_clears_apply(ctx, surf->texture);
+      if (zink_batch_usage_exists(zink_surface(surf)->batch_uses))
+         zink_batch_reference_surface(&ctx->batch, zink_surface(surf));
       ctx->rp_changed = true;
    }
    zink_resource(surf->texture)->fb_binds--;