Mesa (main): zink: set new batch usage during surface rebinds

[GitLab Mirror]

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

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

zink: set new batch usage during surface rebinds

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

---

 src/gallium/drivers/zink/zink_surface.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_surface.c b/src/gallium/drivers/zink/zink_surface.c
index 7cfc211e14a..b3fe21ad8c1 100644
--- a/src/gallium/drivers/zink/zink_surface.c
+++ b/src/gallium/drivers/zink/zink_surface.c
@@ -264,6 +264,7 @@ zink_rebind_surface(struct zink_context *ctx, struct pipe_surface **psurface)
       /* reuse existing surface; old one will be cleaned up naturally */
       struct zink_surface *new_surface = new_entry->data;
       simple_mtx_unlock(&screen->surface_mtx);
+      zink_batch_usage_set(&new_surface->batch_uses, ctx->batch.state);
       zink_surface_reference(screen, (struct zink_surface**)psurface, new_surface);
       return true;
    }
@@ -283,6 +284,7 @@ zink_rebind_surface(struct zink_context *ctx, struct pipe_surface **psurface)
    surface->simage_view = surface->image_view;
    surface->image_view = image_view;
    surface->obj = zink_resource(surface->base.texture)->obj;
+   zink_batch_usage_set(&surface->batch_uses, ctx->batch.state);
    simple_mtx_unlock(&screen->surface_mtx);
    return true;
 }