zink: relax zink_resource_buffer_needs_barrier checks
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Sat, 18 Jun 2022 14:05:55 +0000 (10:05 -0400)
committerMarge Bot <emma+marge@anholt.net>
Mon, 20 Jun 2022 00:50:48 +0000 (00:50 +0000)
this now matches zink_resource_image_needs_barrier

cc: mesa-stable

Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-By: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17111>

src/gallium/drivers/zink/zink_context.c

index 1dfc524..89bf9d0 100644 (file)
@@ -3042,7 +3042,7 @@ zink_resource_buffer_needs_barrier(struct zink_resource *res, VkAccessFlags flag
       pipeline = pipeline_access_stage(flags);
    return zink_resource_access_is_write(res->obj->access) ||
           zink_resource_access_is_write(flags) ||
-          ((res->obj->access_stage & pipeline) != pipeline && !(res->obj->access_stage & (pipeline - 1))) ||
+          (res->obj->access_stage & pipeline) != pipeline ||
           (res->obj->access & flags) != flags;
 }