diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index 91447aa0355..151ebdfe95f 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -38,7 +38,7 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs) set_foreach_remove(bs->resources, entry) { struct zink_resource_object *obj = (struct zink_resource_object *)entry->key; if (!zink_resource_object_usage_unset(obj, bs)) { - obj->unordered_barrier = false; + obj->unordered_exec = false; obj->access = 0; obj->access_stage = 0; } diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 6d77170440d..3d337d5036b 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3112,12 +3112,12 @@ resource_check_defer_buffer_barrier(struct zink_context *ctx, struct zink_resour static inline VkCommandBuffer get_cmdbuf(struct zink_context *ctx, struct zink_resource *res) { - if ((res->obj->access && !res->obj->unordered_barrier) || !ctx->batch.in_rp || (zink_debug & ZINK_DEBUG_NOREORDER) > 0) { + if ((res->obj->access && !res->obj->unordered_exec) || !ctx->batch.in_rp || (zink_debug & ZINK_DEBUG_NOREORDER) > 0) { zink_batch_no_rp(ctx); - res->obj->unordered_barrier = false; + res->obj->unordered_exec = false; return ctx->batch.state->cmdbuf; } - res->obj->unordered_barrier = true; + res->obj->unordered_exec = true; ctx->batch.state->has_barriers = true; return ctx->batch.state->barrier_cmdbuf; } diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h index 2d6160e644c..0151c7b4d57 100644 --- a/src/gallium/drivers/zink/zink_resource.h +++ b/src/gallium/drivers/zink/zink_resource.h @@ -60,7 +60,7 @@ struct zink_resource_object { VkPipelineStageFlagBits access_stage; VkAccessFlags access; - bool unordered_barrier; + bool unordered_exec; unsigned persistent_maps; //if nonzero, requires vkFlushMappedMemoryRanges during batch use struct zink_descriptor_refs desc_set_refs;