diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2015-06-24 14:34:53 +1200 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2015-07-07 14:54:05 +1200 |
| commit | 5cf9608c7edda155e5f4aa2327b4fd57cc188fc9 (patch) | |
| tree | 62e86ecbdf95fd4d6496b1a087900ba7c7706bed /layers | |
| parent | d0100a40aa1d733911f7238be3b9b3f1a024c764 (diff) | |
| download | usermoji-5cf9608c7edda155e5f4aa2327b4fd57cc188fc9.tar.xz | |
vulkan.h: v129 -- rework clear colors, remove raw clear [#14020]
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Diffstat (limited to 'layers')
| -rw-r--r-- | layers/draw_state.cpp | 6 | ||||
| -rw-r--r-- | layers/image.cpp | 4 | ||||
| -rw-r--r-- | layers/mem_tracker.cpp | 2 | ||||
| -rw-r--r-- | layers/param_checker.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 3da7d54c..fa3b36aa 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -2482,7 +2482,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destB 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 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRende 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; } diff --git a/layers/image.cpp b/layers/image.cpp index 02827951..d2c449ec 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -340,10 +340,10 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRende 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()); } } diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 0411ca10..e4db2928 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -1923,7 +1923,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) { diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 643399a4..3074ab11 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -8415,7 +8415,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer( void PreCmdClearColorImage( VkCmdBuffer cmdBuffer, - const VkClearColor* pColor, + const VkClearColorValue* pColor, const VkImageSubresourceRange* pRanges) { if(cmdBuffer == nullptr) @@ -8481,7 +8481,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) { |