From b3ab233ff780d4334091e7622da66871ffa9cc3d Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sun, 3 Dec 2023 19:41:49 +0000
Subject: [PATCH] pvr: update symbols that have become aliases for newer ones

All of these have been renamed in the spec (usually by being promoted);
renamed them in our code too.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26486>
---
 src/imagination/vulkan/pvr_blit.c       | 16 ++++++++--------
 src/imagination/vulkan/pvr_cmd_buffer.c |  2 +-
 src/imagination/vulkan/pvr_private.h    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/imagination/vulkan/pvr_blit.c b/src/imagination/vulkan/pvr_blit.c
index e391f975221..7cf1585084e 100644
--- a/src/imagination/vulkan/pvr_blit.c
+++ b/src/imagination/vulkan/pvr_blit.c
@@ -211,8 +211,8 @@ static void pvr_setup_transfer_surface(struct pvr_device *device,
    }
 }
 
-void pvr_CmdBlitImage2KHR(VkCommandBuffer commandBuffer,
-                          const VkBlitImageInfo2KHR *pBlitImageInfo)
+void pvr_CmdBlitImage2(VkCommandBuffer commandBuffer,
+                          const VkBlitImageInfo2 *pBlitImageInfo)
 {
    PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
    PVR_FROM_HANDLE(pvr_image, src, pBlitImageInfo->srcImage);
@@ -687,8 +687,8 @@ static bool pvr_can_merge_ds_regions(const VkImageCopy2 *pRegionA,
    return true;
 }
 
-void pvr_CmdCopyImage2KHR(VkCommandBuffer commandBuffer,
-                          const VkCopyImageInfo2KHR *pCopyImageInfo)
+void pvr_CmdCopyImage2(VkCommandBuffer commandBuffer,
+                          const VkCopyImageInfo2 *pCopyImageInfo)
 {
    PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
    PVR_FROM_HANDLE(pvr_image, src, pCopyImageInfo->srcImage);
@@ -885,9 +885,9 @@ pvr_copy_buffer_to_image_region(struct pvr_cmd_buffer *const cmd_buffer,
                                                  flags);
 }
 
-void pvr_CmdCopyBufferToImage2KHR(
+void pvr_CmdCopyBufferToImage2(
    VkCommandBuffer commandBuffer,
-   const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo)
+   const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo)
 {
    PVR_FROM_HANDLE(pvr_buffer, src, pCopyBufferToImageInfo->srcBuffer);
    PVR_FROM_HANDLE(pvr_image, dst, pCopyBufferToImageInfo->dstImage);
@@ -1354,7 +1354,7 @@ void pvr_CmdUpdateBuffer(VkCommandBuffer commandBuffer,
                               false);
 }
 
-void pvr_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer,
+void pvr_CmdCopyBuffer2(VkCommandBuffer commandBuffer,
                            const VkCopyBufferInfo2 *pCopyBufferInfo)
 {
    PVR_FROM_HANDLE(pvr_buffer, src, pCopyBufferInfo->srcBuffer);
@@ -2264,7 +2264,7 @@ void pvr_CmdClearAttachments(VkCommandBuffer commandBuffer,
                          false);
 }
 
-void pvr_CmdResolveImage2KHR(VkCommandBuffer commandBuffer,
+void pvr_CmdResolveImage2(VkCommandBuffer commandBuffer,
                              const VkResolveImageInfo2 *pResolveImageInfo)
 {
    PVR_FROM_HANDLE(pvr_image, src, pResolveImageInfo->srcImage);
diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index 2bdc2f740ff..c510640bb48 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -7969,7 +7969,7 @@ void pvr_CmdWaitEvents2(VkCommandBuffer commandBuffer,
    pvr_cmd_buffer_end_sub_cmd(cmd_buffer);
 }
 
-void pvr_CmdWriteTimestamp2KHR(VkCommandBuffer commandBuffer,
+void pvr_CmdWriteTimestamp2(VkCommandBuffer commandBuffer,
                                VkPipelineStageFlags2 stage,
                                VkQueryPool queryPool,
                                uint32_t query)
diff --git a/src/imagination/vulkan/pvr_private.h b/src/imagination/vulkan/pvr_private.h
index f7b4deee35d..b23680a31ce 100644
--- a/src/imagination/vulkan/pvr_private.h
+++ b/src/imagination/vulkan/pvr_private.h
@@ -1330,7 +1330,7 @@ pvr_stage_mask(VkPipelineStageFlags2 stage_mask)
 }
 
 static inline enum pvr_pipeline_stage_bits
-pvr_stage_mask_src(VkPipelineStageFlags2KHR stage_mask)
+pvr_stage_mask_src(VkPipelineStageFlags2 stage_mask)
 {
    /* If the source is bottom of pipe, all stages will need to be waited for. */
    if (stage_mask & VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT)
@@ -1340,7 +1340,7 @@ pvr_stage_mask_src(VkPipelineStageFlags2KHR stage_mask)
 }
 
 static inline enum pvr_pipeline_stage_bits
-pvr_stage_mask_dst(VkPipelineStageFlags2KHR stage_mask)
+pvr_stage_mask_dst(VkPipelineStageFlags2 stage_mask)
 {
    /* If the destination is top of pipe, all stages should be blocked by prior
     * commands.