From: Karol Herbst <kherbst@redhat.com>
Date: Fri, 10 Jun 2022 18:11:13 +0000 (+0200)
Subject: nvk: implement CmdCopyBuffer2
X-Git-Tag: upstream/23.3.3~4559
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaed2a4340099b9438a6433259b534350396d9ea;p=platform%2Fupstream%2Fmesa.git

nvk: implement CmdCopyBuffer2

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

diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c
index 283af1b..d21b09e 100644
--- a/src/nouveau/vulkan/nvk_cmd_copy.c
+++ b/src/nouveau/vulkan/nvk_cmd_copy.c
@@ -205,19 +205,19 @@ nouveau_copy_rect(struct nvk_cmd_buffer *cmd, struct nouveau_copy *copy)
 }
 
 VKAPI_ATTR void VKAPI_CALL
-nvk_CmdCopyBuffer(VkCommandBuffer commandBuffer,
-                  VkBuffer srcBuffer, VkBuffer dstBuffer,
-                  uint32_t regionCount, const VkBufferCopy* pRegions)
+nvk_CmdCopyBuffer2(
+   VkCommandBuffer commandBuffer,
+   const VkCopyBufferInfo2 *pCopyBufferInfo)
 {
    VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
-   VK_FROM_HANDLE(nvk_buffer, src, srcBuffer);
-   VK_FROM_HANDLE(nvk_buffer, dst, dstBuffer);
+   VK_FROM_HANDLE(nvk_buffer, src, pCopyBufferInfo->srcBuffer);
+   VK_FROM_HANDLE(nvk_buffer, dst, pCopyBufferInfo->dstBuffer);
 
    nvk_push_buffer_ref(cmd->push, src, NOUVEAU_WS_BO_RD);
    nvk_push_buffer_ref(cmd->push, dst, NOUVEAU_WS_BO_WR);
 
-   for (unsigned r = 0; r < regionCount; r++) {
-      const VkBufferCopy *region = &pRegions[r];
+   for (unsigned r = 0; r < pCopyBufferInfo->regionCount; r++) {
+      const VkBufferCopy2 *region = &pCopyBufferInfo->pRegions[r];
 
       nouveau_copy_linear(cmd->push,
                           nvk_buffer_address(src, region->srcOffset),