From 4a3cea6730f4aa1df30c1a2e4752638fa060ba63 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 14 Jul 2022 11:20:26 -0400 Subject: [PATCH] zink: stop ORing unordered barrier access this doesn't make any sense and is confusing Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_context.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 9df1e266e67..f10ef80bff0 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3183,13 +3183,8 @@ zink_resource_image_barrier(struct zink_context *ctx, struct zink_resource *res, resource_check_defer_image_barrier(ctx, res, new_layout, pipeline); - if (res->obj->unordered_barrier) { - res->obj->access |= imb.dstAccessMask; - res->obj->access_stage |= pipeline; - } else { - res->obj->access = imb.dstAccessMask; - res->obj->access_stage = pipeline; - } + res->obj->access = imb.dstAccessMask; + res->obj->access_stage = pipeline; res->layout = new_layout; } @@ -3275,13 +3270,8 @@ zink_resource_buffer_barrier(struct zink_context *ctx, struct zink_resource *res resource_check_defer_buffer_barrier(ctx, res, pipeline); - if (res->obj->unordered_barrier) { - res->obj->access |= bmb.dstAccessMask; - res->obj->access_stage |= pipeline; - } else { - res->obj->access = bmb.dstAccessMask; - res->obj->access_stage = pipeline; - } + res->obj->access = bmb.dstAccessMask; + res->obj->access_stage = pipeline; } bool