commit f0796e1f48fab46430e4d60ad552602ec1bfde63
author Chris Forbes <chrisf@ijw.co.nz> Wed Jun 24 14:34:53 2015 +1200
committer Chris Forbes <chrisf@ijw.co.nz> Tue Jul 07 14:54:05 2015 +1200
tree 896da1be675ac348f796407b188a770b5f487d70
parent fa27b95904b7ee472c3ccd69ff670411cb9010b6

vulkan.h: v129 -- rework clear colors, remove raw clear [#14020]

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 3da7d54..fa3b36a 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2482,7 +2482,7 @@
 VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage(
         VkCmdBuffer cmdBuffer,
         VkImage image, VkImageLayout imageLayout,
-        const VkClearColor *pColor,
+        const VkClearColorValue *pColor,
         uint32_t rangeCount, const VkImageSubresourceRange* pRanges)
 {
     GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
@@ -2682,8 +2682,8 @@
             memcpy((void*)localRPCI->pColorStoreOps, pCreateInfo->pColorStoreOps, localRPCI->colorAttachmentCount*sizeof(VkAttachmentStoreOp));
         }
         if (pCreateInfo->pColorLoadClearValues) {
-            localRPCI->pColorLoadClearValues = new VkClearColor[localRPCI->colorAttachmentCount];
-            memcpy((void*)localRPCI->pColorLoadClearValues, pCreateInfo->pColorLoadClearValues, localRPCI->colorAttachmentCount*sizeof(VkClearColor));
+            localRPCI->pColorLoadClearValues = new VkClearColorValue[localRPCI->colorAttachmentCount];
+            memcpy((void*)localRPCI->pColorLoadClearValues, pCreateInfo->pColorLoadClearValues, localRPCI->colorAttachmentCount*sizeof(VkClearColorValue));
         }
         renderPassMap[*pRenderPass] = localRPCI;
     }

layers/image.cpp

diff --git a/layers/image.cpp b/layers/image.cpp
index 0282795..d2c449e 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -340,10 +340,10 @@
 
     for(uint32_t i = 0; i < pCreateInfo->colorAttachmentCount; ++i)
     {
-        if(!vk_validate_vkclearcolor(&(pCreateInfo->pColorLoadClearValues[i])))
+        if(!vk_validate_vkclearcolorvalue(&(pCreateInfo->pColorLoadClearValues[i])))
         {
             std::stringstream ss;
-            ss << "vkCreateRenderPass parameter, VkClearColor pCreateInfo->pColorLoadClearValues[" << i << "], is invalid";
+            ss << "vkCreateRenderPass parameter, VkClearColorValue pCreateInfo->pColorLoadClearValues[" << i << "], is invalid";
             log_msg(mdd(device), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "IMAGE", ss.str().c_str());
         }
     }

layers/mem_tracker.cpp

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 0411ca1..e4db292 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1923,7 +1923,7 @@
     VkCmdBuffer                    cmdBuffer,
     VkImage                        image,
     VkImageLayout                  imageLayout,
-    const VkClearColor            *pColor,
+    const VkClearColorValue       *pColor,
     uint32_t                       rangeCount,
     const VkImageSubresourceRange *pRanges)
 {

layers/param_checker.cpp

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 643399a..3074ab1 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -8415,7 +8415,7 @@
 
 void PreCmdClearColorImage(
     VkCmdBuffer cmdBuffer,
-    const VkClearColor* pColor,
+    const VkClearColorValue* pColor,
     const VkImageSubresourceRange* pRanges)
 {
     if(cmdBuffer == nullptr)
@@ -8481,7 +8481,7 @@
     VkCmdBuffer cmdBuffer,
     VkImage image,
     VkImageLayout imageLayout,
-    const VkClearColor* pColor,
+    const VkClearColorValue* pColor,
     uint32_t rangeCount,
     const VkImageSubresourceRange* pRanges)
 {