Mesa (main): zink: move resource object ref to batch in invalidate hook

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed May 12 07:16:54 2021 -0400

zink: move resource object ref to batch in invalidate hook

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

---

 src/gallium/drivers/zink/zink_resource.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 0691277edc3..a8245af9865 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -750,13 +750,20 @@ invalidate_buffer(struct zink_context *ctx, struct zink_resource *res)
       debug_printf("new backing resource alloc failed!");
       return false;
    }
+   bool needs_unref = true;
+   if (zink_batch_usage_exists(old_obj->reads) ||
+       zink_batch_usage_exists(old_obj->writes)) {
+      zink_batch_reference_resource_move(&ctx->batch, res);
+      needs_unref = false;
+   }
    res->obj = new_obj;
    res->access_stage = 0;
    res->access = 0;
    res->unordered_barrier = false;
    zink_resource_rebind(ctx, res);
    zink_descriptor_set_refs_clear(&old_obj->desc_set_refs, old_obj);
-   zink_resource_object_reference(screen, &old_obj, NULL);
+   if (needs_unref)
+      zink_resource_object_reference(screen, &old_obj, NULL);
    return true;
 }