Mesa (main): Revert "zink: simplify some dumb code in invalidate_buffer"

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Jul 28 19:04:55 2021 -0400

Revert "zink: simplify some dumb code in invalidate_buffer"

This reverts commit 6bda555cc0e0b8c511b77989069402d6019452d2.

this needs to stay dumb in order to preserve the ref on the resource
without destroying it during rebind

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

---

 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 d717e7ed4af..0ce318c9fd8 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -1022,18 +1022,25 @@ invalidate_buffer(struct zink_context *ctx, struct zink_resource *res)
       return false;
 
    struct zink_resource_object *old_obj = res->obj;
+   bool has_usage = zink_resource_has_usage(res);
    struct zink_resource_object *new_obj = resource_object_create(screen, &res->base.b, NULL, NULL, NULL, 0);
    if (!new_obj) {
       debug_printf("new backing resource alloc failed!");
       return false;
    }
+   bool needs_unref = true;
+   if (has_usage) {
+      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_batch_reference_resource_move(&ctx->batch, res);
+   if (needs_unref)
+      zink_resource_object_reference(screen, &old_obj, NULL);
    return true;
 }