zink: add a batch ref when replacing a buffer that has binds and usage
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Thu, 2 Sep 2021 21:16:56 +0000 (17:16 -0400)
committerMarge Bot <eric+marge@anholt.net>
Mon, 13 Sep 2021 03:40:54 +0000 (03:40 +0000)
any resource with active binds will have exactly 1 ref for the bind, so
if it also has usage, it needs to be destroyed on the batch to avoid
early deletion while it's in use

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

src/gallium/drivers/zink/zink_context.c

index 842b1aa..6ee3be7 100644 (file)
@@ -3446,7 +3446,8 @@ zink_context_replace_buffer_storage(struct pipe_context *pctx, struct pipe_resou
    assert(d->obj);
    assert(s->obj);
    util_idalloc_mt_free(&zink_screen(pctx->screen)->buffer_ids, delete_buffer_id);
-   if (zink_resource_has_unflushed_usage(d))
+   if (zink_resource_has_unflushed_usage(d) ||
+       (zink_resource_has_usage(d) && zink_resource_has_binds(d)))
       zink_batch_reference_resource(&ctx->batch, d);
    zink_resource_object_reference(zink_screen(pctx->screen), &d->obj, s->obj);
    d->access = s->access;