vulkan,anv: Move VK_KHR_copy_commands2 wrappers to common code

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8676>

1 files changed, 0 insertions, 207 deletions

diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 9f624b2c40b..087fd554491 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -415,42 +415,6 @@ copy_image(struct anv_cmd_buffer *cmd_buffer,
    }
 }
 
-
-void anv_CmdCopyImage(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     srcImage,
-    VkImageLayout                               srcImageLayout,
-    VkImage                                     dstImage,
-    VkImageLayout                               dstImageLayout,
-    uint32_t                                    regionCount,
-    const VkImageCopy*                          pRegions)
-{
-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
-   ANV_FROM_HANDLE(anv_image, src_image, srcImage);
-   ANV_FROM_HANDLE(anv_image, dst_image, dstImage);
-
-   struct blorp_batch batch;
-   blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);
-
-   for (unsigned r = 0; r < regionCount; r++) {
-      VkImageCopy2KHR copy = {
-         .sType = VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR,
-         .srcSubresource = pRegions[r].srcSubresource,
-         .srcOffset      = pRegions[r].srcOffset,
-         .dstSubresource = pRegions[r].dstSubresource,
-         .dstOffset      = pRegions[r].dstOffset,
-         .extent         = pRegions[r].extent,
-      };
-
-      copy_image(cmd_buffer, &batch,
-                 src_image, srcImageLayout,
-                 dst_image, dstImageLayout,
-                 &copy);
-   }
-
-   blorp_batch_finish(&batch);
-}
-
 void anv_CmdCopyImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyImageInfo2KHR*                  pCopyImageInfo)
@@ -623,39 +587,6 @@ copy_buffer_to_image(struct anv_cmd_buffer *cmd_buffer,
    }
 }
 
-void anv_CmdCopyBufferToImage(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    srcBuffer,
-    VkImage                                     dstImage,
-    VkImageLayout                               dstImageLayout,
-    uint32_t                                    regionCount,
-    const VkBufferImageCopy*                    pRegions)
-{
-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
-   ANV_FROM_HANDLE(anv_buffer, src_buffer, srcBuffer);
-   ANV_FROM_HANDLE(anv_image, dst_image, dstImage);
-
-   struct blorp_batch batch;
-   blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);
-
-   for (unsigned r = 0; r < regionCount; r++) {
-      VkBufferImageCopy2KHR copy = {
-         .sType = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR,
-         .bufferOffset      = pRegions[r].bufferOffset,
-         .bufferRowLength   = pRegions[r].bufferRowLength,
-         .bufferImageHeight = pRegions[r].bufferImageHeight,
-         .imageSubresource  = pRegions[r].imageSubresource,
-         .imageOffset       = pRegions[r].imageOffset,
-         .imageExtent       = pRegions[r].imageExtent,
-      };
-
-      copy_buffer_to_image(cmd_buffer, &batch, src_buffer, dst_image,
-                           dstImageLayout, &copy, true);
-   }
-
-   blorp_batch_finish(&batch);
-}
-
 void anv_CmdCopyBufferToImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyBufferToImageInfo2KHR*          pCopyBufferToImageInfo)
@@ -676,41 +607,6 @@ void anv_CmdCopyBufferToImage2KHR(
    blorp_batch_finish(&batch);
 }
 
-void anv_CmdCopyImageToBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     srcImage,
-    VkImageLayout                               srcImageLayout,
-    VkBuffer                                    dstBuffer,
-    uint32_t                                    regionCount,
-    const VkBufferImageCopy*                    pRegions)
-{
-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
-   ANV_FROM_HANDLE(anv_image, src_image, srcImage);
-   ANV_FROM_HANDLE(anv_buffer, dst_buffer, dstBuffer);
-
-   struct blorp_batch batch;
-   blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);
-
-   for (unsigned r = 0; r < regionCount; r++) {
-      VkBufferImageCopy2KHR copy = {
-         .sType = VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR,
-         .bufferOffset      = pRegions[r].bufferOffset,
-         .bufferRowLength   = pRegions[r].bufferRowLength,
-         .bufferImageHeight = pRegions[r].bufferImageHeight,
-         .imageSubresource  = pRegions[r].imageSubresource,
-         .imageOffset       = pRegions[r].imageOffset,
-         .imageExtent       = pRegions[r].imageExtent,
-      };
-
-      copy_buffer_to_image(cmd_buffer, &batch, dst_buffer, src_image,
-                           srcImageLayout, &copy, false);
-   }
-
-   blorp_batch_finish(&batch);
-
-   cmd_buffer->state.pending_pipe_bits |= ANV_PIPE_RENDER_TARGET_BUFFER_WRITES;
-}
-
 void anv_CmdCopyImageToBuffer2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyImageToBufferInfo2KHR*          pCopyImageToBufferInfo)
@@ -871,47 +767,6 @@ blit_image(struct anv_cmd_buffer *cmd_buffer,
    }
 }
 
-void anv_CmdBlitImage(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     srcImage,
-    VkImageLayout                               srcImageLayout,
-    VkImage                                     dstImage,
-    VkImageLayout                               dstImageLayout,
-    uint32_t                                    regionCount,
-    const VkImageBlit*                          pRegions,
-    VkFilter                                    filter)
-{
-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
-   ANV_FROM_HANDLE(anv_image, src_image, srcImage);
-   ANV_FROM_HANDLE(anv_image, dst_image, dstImage);
-
-   struct blorp_batch batch;
-   blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);
-
-   for (unsigned r = 0; r < regionCount; r++) {
-      VkImageBlit2KHR blit = {
-         .sType          = VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR,
-         .srcSubresource = pRegions[r].srcSubresource,
-         .srcOffsets     = {
-            pRegions[r].srcOffsets[0],
-            pRegions[r].srcOffsets[1],
-         },
-         .dstSubresource = pRegions[r].dstSubresource,
-         .dstOffsets     = {
-            pRegions[r].dstOffsets[0],
-            pRegions[r].dstOffsets[1],
-         },
-      };
-
-      blit_image(cmd_buffer, &batch,
-                 src_image, srcImageLayout,
-                 dst_image, dstImageLayout,
-                 &blit, filter);
-   }
-
-   blorp_batch_finish(&batch);
-}
-
 void anv_CmdBlitImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkBlitImageInfo2KHR*                  pBlitImageInfo)
@@ -977,36 +832,6 @@ copy_buffer(struct anv_device *device,
    blorp_buffer_copy(batch, src, dst, region->size);
 }
 
-void anv_CmdCopyBuffer(
-    VkCommandBuffer                             commandBuffer,
-    VkBuffer                                    srcBuffer,
-    VkBuffer                                    dstBuffer,
-    uint32_t                                    regionCount,
-    const VkBufferCopy*                         pRegions)
-{
-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
-   ANV_FROM_HANDLE(anv_buffer, src_buffer, srcBuffer);
-   ANV_FROM_HANDLE(anv_buffer, dst_buffer, dstBuffer);
-
-   struct blorp_batch batch;
-   blorp_batch_init(&cmd_buffer->device->blorp, &batch, cmd_buffer, 0);
-
-   for (unsigned r = 0; r < regionCount; r++) {
-      VkBufferCopy2KHR copy = {
-         .sType = VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR,
-         .srcOffset = pRegions[r].srcOffset,
-         .dstOffset = pRegions[r].dstOffset,
-         .size = pRegions[r].size,
-      };
-
-      copy_buffer(cmd_buffer->device, &batch, src_buffer, dst_buffer, &copy);
-   }
-
-   blorp_batch_finish(&batch);
-
-   cmd_buffer->state.pending_pipe_bits |= ANV_PIPE_RENDER_TARGET_BUFFER_WRITES;
-}
-
 void anv_CmdCopyBuffer2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkCopyBufferInfo2KHR*                 pCopyBufferInfo)
@@ -1663,38 +1488,6 @@ resolve_image(struct anv_cmd_buffer *cmd_buffer,
    }
 }
 
-void anv_CmdResolveImage(
-    VkCommandBuffer                             commandBuffer,
-    VkImage                                     srcImage,
-    VkImageLayout                               srcImageLayout,
-    VkImage                                     dstImage,
-    VkImageLayout                               dstImageLayout,
-    uint32_t                                    regionCount,
-    const VkImageResolve*                       pRegions)
-{
-   ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
-   ANV_FROM_HANDLE(anv_image, src_image, srcImage);
-   ANV_FROM_HANDLE(anv_image, dst_image, dstImage);
-
-   assert(!src_image->format->can_ycbcr);
-
-   for (uint32_t r = 0; r < regionCount; r++) {
-      VkImageResolve2KHR resolve = {
-         .sType = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR,
-         .srcSubresource = pRegions[r].srcSubresource,
-         .srcOffset      = pRegions[r].srcOffset,
-         .dstSubresource = pRegions[r].dstSubresource,
-         .dstOffset      = pRegions[r].dstOffset,
-         .extent         = pRegions[r].extent,
-      };
-
-      resolve_image(cmd_buffer,
-                    src_image, srcImageLayout,
-                    dst_image, dstImageLayout,
-                    &resolve);
-   }
-}
-
 void anv_CmdResolveImage2KHR(
     VkCommandBuffer                             commandBuffer,
     const VkResolveImageInfo2KHR*               pResolveImageInfo)