From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 16 Aug 2023 16:53:32 +0000 (-0400)
Subject: zink: make zink_resource_image_barrier2_init public
X-Git-Tag: upstream/23.3.3~2280
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc339f9589895b80ed35e3853703a5a9cc0de27;p=platform%2Fupstream%2Fmesa.git

zink: make zink_resource_image_barrier2_init public

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24962>
---

diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index c6b89b2..2eacd4b 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -123,6 +123,8 @@ zink_resource_image_needs_barrier(struct zink_resource *res, VkImageLayout new_l
 void
 zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline);
 void
+zink_resource_image_barrier2_init(VkImageMemoryBarrier2 *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline);
+void
 zink_resource_image_barrier(struct zink_context *ctx, struct zink_resource *res,
                       VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline);
 void
diff --git a/src/gallium/drivers/zink/zink_synchronization.cpp b/src/gallium/drivers/zink/zink_synchronization.cpp
index ce06e5d..4ef12d7 100644
--- a/src/gallium/drivers/zink/zink_synchronization.cpp
+++ b/src/gallium/drivers/zink/zink_synchronization.cpp
@@ -199,7 +199,7 @@ zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource
    };
 }
 
-static void
+void
 zink_resource_image_barrier2_init(VkImageMemoryBarrier2 *imb, struct zink_resource *res, VkImageLayout new_layout, VkAccessFlags flags, VkPipelineStageFlags pipeline)
 {
    if (!pipeline)