From a74f93c0eedce6a03e0f7ca41d0d1b4c871fece9 Mon Sep 17 00:00:00 2001
From: Tony Barbour <tony@LunarG.com>
Date: Mon, 13 Apr 2015 15:02:52 -0600
Subject: vulkan.h: Rename parameters in vkCmdResolveImage calls

---
 layers/draw_state.cpp    | 4 ++--
 layers/mem_tracker.cpp   | 4 ++--
 layers/param_checker.cpp | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'layers')

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 1fe60c3c..bdeaba5a 100644
--- 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 b6a46b33..c5f83d23 100644
--- 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 b3da3b24..2fe5ee5e 100644
--- 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)
-- 
cgit v1.2.3