KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: zink_resource::unordered_barrier -> unordered_exec 

this is a bit more clear

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17667>
This commit is contained in:
Mike Blumenkrantz 2022-07-14 11:20:46 -04:00 committed by Marge Bot
parent a41ea582c4
commit e5c4c33fa6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/zink/zink_batch.c
View File

@ -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;
}

6
src/gallium/drivers/zink/zink_context.c
View File

@ -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;
}

2
src/gallium/drivers/zink/zink_resource.h
View File

@ -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;