Mesa (main): zink: simplify some dumb code in invalidate_buffer (v2)
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jul 29 00:05:11 UTC 2021
Module: Mesa
Branch: main
Commit: 461662bf3c9dd7a6214650ac661dbc9b32fa6508
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=461662bf3c9dd7a6214650ac661dbc9b32fa6508
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Wed Jul 28 19:16:04 2021 -0400
zink: simplify some dumb code in invalidate_buffer (v2)
the ref has to be preserved so that rebind doesn't destroy it prematurely
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 | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 0ce318c9fd8..3a706a9fc9c 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -1022,25 +1022,19 @@ 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;
- }
+ /* this ref must be transferred before rebind or else BOOM */
+ zink_batch_reference_resource_move(&ctx->batch, res);
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);
- if (needs_unref)
- zink_resource_object_reference(screen, &old_obj, NULL);
return true;
}
More information about the mesa-commit
mailing list