panvk: Move copy stubs to a separate file

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12095>

diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build
index 1ad571f..ed02538 100644 (file)
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@@ -68,6 +68,7 @@ foreach arch : ['5', '6', '7']
       'panvk_vX_device.c',
       'panvk_vX_image.c',
       'panvk_vX_meta.c',
+      'panvk_vX_meta_copy.c',
       'panvk_vX_meta_clear.c',
       'panvk_vX_pipeline.c',
       'panvk_vX_shader.c',

diff --git a/src/panfrost/vulkan/panvk_vX_meta.c b/src/panfrost/vulkan/panvk_vX_meta.c
index 737c57e..90b28b0 100644 (file)
--- a/src/panfrost/vulkan/panvk_vX_meta.c
+++ b/src/panfrost/vulkan/panvk_vX_meta.c
@@ -47,50 +47,6 @@ panvk_per_arch(CmdBlitImage)(VkCommandBuffer commandBuffer,
 }
 
 void
-panvk_per_arch(CmdCopyImage)(VkCommandBuffer commandBuffer,
-                             VkImage srcImage,
-                             VkImageLayout srcImageLayout,
-                             VkImage destImage,
-                             VkImageLayout destImageLayout,
-                             uint32_t regionCount,
-                             const VkImageCopy *pRegions)
-{
-   panvk_stub();
-}
-
-void
-panvk_per_arch(CmdCopyBufferToImage)(VkCommandBuffer commandBuffer,
-                                     VkBuffer srcBuffer,
-                                     VkImage destImage,
-                                     VkImageLayout destImageLayout,
-                                     uint32_t regionCount,
-                                     const VkBufferImageCopy *pRegions)
-{
-   panvk_stub();
-}
-
-void
-panvk_per_arch(CmdCopyImageToBuffer)(VkCommandBuffer commandBuffer,
-                                     VkImage srcImage,
-                                     VkImageLayout srcImageLayout,
-                                     VkBuffer destBuffer,
-                                     uint32_t regionCount,
-                                     const VkBufferImageCopy *pRegions)
-{
-   panvk_stub();
-}
-
-void
-panvk_per_arch(CmdCopyBuffer)(VkCommandBuffer commandBuffer,
-                              VkBuffer srcBuffer,
-                              VkBuffer destBuffer,
-                              uint32_t regionCount,
-                              const VkBufferCopy *pRegions)
-{
-   panvk_stub();
-}
-
-void
 panvk_per_arch(CmdResolveImage)(VkCommandBuffer cmd_buffer_h,
                                 VkImage src_image_h,
                                 VkImageLayout src_image_layout,
@@ -102,26 +58,6 @@ panvk_per_arch(CmdResolveImage)(VkCommandBuffer cmd_buffer_h,
    panvk_stub();
 }
 
-void
-panvk_per_arch(CmdFillBuffer)(VkCommandBuffer commandBuffer,
-                              VkBuffer dstBuffer,
-                              VkDeviceSize dstOffset,
-                              VkDeviceSize fillSize,
-                              uint32_t data)
-{
-   panvk_stub();
-}
-
-void
-panvk_per_arch(CmdUpdateBuffer)(VkCommandBuffer commandBuffer,
-                                VkBuffer dstBuffer,
-                                VkDeviceSize dstOffset,
-                                VkDeviceSize dataSize,
-                                const void *pData)
-{
-   panvk_stub();
-}
-
 mali_ptr
 panvk_per_arch(meta_emit_viewport)(struct pan_pool *pool,
                                    uint16_t minx, uint16_t miny,

diff --git a/src/panfrost/vulkan/panvk_vX_meta_copy.c b/src/panfrost/vulkan/panvk_vX_meta_copy.c
new file mode 100644 (file)
index 0000000..09cc575
--- /dev/null
+++ b/src/panfrost/vulkan/panvk_vX_meta_copy.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2021 Collabora Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "gen_macros.h"
+
+#include "panvk_private.h"
+
+void
+panvk_per_arch(CmdCopyImage)(VkCommandBuffer commandBuffer,
+                             VkImage srcImage,
+                             VkImageLayout srcImageLayout,
+                             VkImage destImage,
+                             VkImageLayout destImageLayout,
+                             uint32_t regionCount,
+                             const VkImageCopy *pRegions)
+{
+   panvk_stub();
+}
+
+void
+panvk_per_arch(CmdCopyBufferToImage)(VkCommandBuffer commandBuffer,
+                                     VkBuffer srcBuffer,
+                                     VkImage destImage,
+                                     VkImageLayout destImageLayout,
+                                     uint32_t regionCount,
+                                     const VkBufferImageCopy *pRegions)
+{
+   panvk_stub();
+}
+
+void
+panvk_per_arch(CmdCopyImageToBuffer)(VkCommandBuffer commandBuffer,
+                                     VkImage srcImage,
+                                     VkImageLayout srcImageLayout,
+                                     VkBuffer destBuffer,
+                                     uint32_t regionCount,
+                                     const VkBufferImageCopy *pRegions)
+{
+   panvk_stub();
+}
+
+void
+panvk_per_arch(CmdCopyBuffer)(VkCommandBuffer commandBuffer,
+                              VkBuffer srcBuffer,
+                              VkBuffer destBuffer,
+                              uint32_t regionCount,
+                              const VkBufferCopy *pRegions)
+{
+   panvk_stub();
+}
+
+void
+panvk_per_arch(CmdFillBuffer)(VkCommandBuffer commandBuffer,
+                              VkBuffer dstBuffer,
+                              VkDeviceSize dstOffset,
+                              VkDeviceSize fillSize,
+                              uint32_t data)
+{
+   panvk_stub();
+}
+
+void
+panvk_per_arch(CmdUpdateBuffer)(VkCommandBuffer commandBuffer,
+                                VkBuffer dstBuffer,
+                                VkDeviceSize dstOffset,
+                                VkDeviceSize dataSize,
+                                const void *pData)
+{
+   panvk_stub();
+}