zink: be even dumber about buffer refs when replacing storage
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Thu, 13 Jul 2023 14:33:58 +0000 (10:33 -0400)
committerMarge Bot <emma+marge@anholt.net>
Fri, 21 Jul 2023 01:01:04 +0000 (01:01 +0000)
these extra checks can cause issues when multiple contexts and transfer
ops are involved

cc: mesa-stable

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24141>

src/gallium/drivers/zink/zink_context.c

index 79812ac..8dcf1ef 100644 (file)
@@ -4749,9 +4749,7 @@ zink_context_replace_buffer_storage(struct pipe_context *pctx, struct pipe_resou
    assert(d->obj);
    assert(s->obj);
    util_idalloc_mt_free(&screen->buffer_ids, delete_buffer_id);
-   /* add a ref just like check_resource_for_batch_ref() would've */
-   if (zink_resource_has_binds(d) && zink_resource_has_usage(d))
-      zink_batch_reference_resource(&ctx->batch, d);
+   zink_batch_reference_resource(&ctx->batch, d);
    /* don't be too creative */
    zink_resource_object_reference(screen, &d->obj, s->obj);
    d->valid_buffer_range = s->valid_buffer_range;