vulkan.h: Rename parameters in vkCmdResolveImage calls

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 5dc99de..1a234f2 100644 (file)
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1025,8 +1025,8 @@ ICD_EXPORT void VKAPI vkCmdResolveImage(
     VkImageLayout                            srcImageLayout,
     VkImage                                   destImage,
     VkImageLayout                            destImageLayout,
-    uint32_t                                    rectCount,
-    const VkImageResolve*                    pRects)
+    uint32_t                                    regionCount,
+    const VkImageResolve*                    pRegions)
 {
     NULLDRV_LOG_FUNC;
 }

diff --git a/include/vulkan.h b/include/vulkan.h
index d183e73..5afcda1 100644 (file)
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -2362,7 +2362,7 @@ typedef void     (VKAPI *PFN_vkCmdUpdateBuffer)(VkCmdBuffer cmdBuffer, VkBuffer
 typedef void     (VKAPI *PFN_vkCmdFillBuffer)(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkGpuSize destOffset, VkGpuSize fillSize, uint32_t data);
 typedef void     (VKAPI *PFN_vkCmdClearColorImage)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, VkClearColor color, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
 typedef void     (VKAPI *PFN_vkCmdClearDepthStencil)(VkCmdBuffer cmdBuffer, VkImage image, VkImageLayout imageLayout, float depth, uint32_t stencil, uint32_t rangeCount, const VkImageSubresourceRange* pRanges);
-typedef void     (VKAPI *PFN_vkCmdResolveImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t rectCount, const VkImageResolve* pRects);
+typedef void     (VKAPI *PFN_vkCmdResolveImage)(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageResolve* pRegions);
 typedef void     (VKAPI *PFN_vkCmdSetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent);
 typedef void     (VKAPI *PFN_vkCmdResetEvent)(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent);
 typedef void     (VKAPI *PFN_vkCmdWaitEvents)(VkCmdBuffer cmdBuffer, const VkEventWaitInfo* pWaitInfo);
@@ -2970,8 +2970,8 @@ void VKAPI vkCmdResolveImage(
     VkImageLayout                               srcImageLayout,
     VkImage                                     destImage,
     VkImageLayout                               destImageLayout,
-    uint32_t                                    rectCount,
-    const VkImageResolve*                       pRects);
+    uint32_t                                    regionCount,
+    const VkImageResolve*                       pRegions);
 
 void VKAPI vkCmdSetEvent(
     VkCmdBuffer                                 cmdBuffer,

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 1fe60c3..bdeaba5 100644 (file)
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2371,7 +2371,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VkCmdBuffer cmdBuffer,
 VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer,
                                                 VkImage srcImage, VkImageLayout srcImageLayout,
                                                 VkImage destImage, VkImageLayout destImageLayout,
-                                                uint32_t rectCount, const VkImageResolve* pRects)
+                                                uint32_t regionCount, const VkImageResolve* pRegions)
 {
     GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
     if (pCB) {
@@ -2383,7 +2383,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer,
         sprintf(str, "Attempt to use CmdBuffer %p that doesn't exist!", (void*)cmdBuffer);
         layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", str);
     }
-    nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, rectCount, pRects);
+    nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions);
 }
 
 VK_LAYER_EXPORT void VKAPI vkCmdSetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent)

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index b6a46b3..c5f83d2 100644 (file)
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1832,7 +1832,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VkCmdBuffer cmdBuffer,
 VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer,
                                                 VkImage srcImage, VkImageLayout srcImageLayout,
                                                 VkImage destImage, VkImageLayout destImageLayout,
-                                                uint32_t rectCount, const VkImageResolve* pRects)
+                                                uint32_t regionCount, const VkImageResolve* pRegions)
 {
     loader_platform_thread_lock_mutex(&globalLock);
     VkGpuMemory mem = getMemBindingFromObject(srcImage);
@@ -1848,7 +1848,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer,
         layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str);
     }
     loader_platform_thread_unlock_mutex(&globalLock);
-    nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, rectCount, pRects);
+    nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions);
 }
 
 VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags)

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index b3da3b2..2fe5ee5 100644 (file)
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1431,7 +1431,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil(VkCmdBuffer cmdBuffer, VkImage
     nextTable.CmdClearDepthStencil(cmdBuffer, image, imageLayout, depth, stencil, rangeCount, pRanges);
 }
 
-VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t rectCount, const VkImageResolve* pRects)
+VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout, VkImage destImage, VkImageLayout destImageLayout, uint32_t regionCount, const VkImageResolve* pRegions)
 {
     char str[1024];
     if (!validate_VkImageLayout(srcImageLayout)) {
@@ -1443,13 +1443,13 @@ VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer, VkImage srcI
         layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str);
     }
     uint32_t i;
-    for (i = 0; i < rectCount; i++) {
-        if (!vk_validate_vkimageresolve(&pRects[i])) {
+    for (i = 0; i < regionCount; i++) {
+        if (!vk_validate_vkimageresolve(&pRegions[i])) {
             sprintf(str, "Parameter pRects[%i] to function CmdResolveImage contains an invalid value.", i);
             layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str);
         }
     }
-    nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, rectCount, pRects);
+    nextTable.CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions);
 }
 
 VK_LAYER_EXPORT void VKAPI vkCmdSetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipeEvent pipeEvent)

diff --git a/vulkan.py b/vulkan.py
index 7069928..f5da856 100755 (executable)
--- a/vulkan.py
+++ b/vulkan.py
@@ -760,8 +760,8 @@ core = Extension(
              Param("VkImageLayout", "srcImageLayout"),
              Param("VkImage", "destImage"),
              Param("VkImageLayout", "destImageLayout"),
-             Param("uint32_t", "rectCount"),
-             Param("const VkImageResolve*", "pRects")]),
+             Param("uint32_t", "regionCount"),
+             Param("const VkImageResolve*", "pRegions")]),
 
         Proto("void", "CmdSetEvent",
             [Param("VkCmdBuffer", "cmdBuffer"),