From 372bbaeef708f35e07e269bda7292285a89f2bf0 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 4 Aug 2015 11:51:03 -0600 Subject: v144: Bug 14292 - Rename VkRenderPassBeginInfo::attachmentCount to clearValueCount --- demos/cube.c | 4 ++-- demos/tri.c | 4 ++-- include/vulkan.h | 6 +++--- layers/param_checker.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demos/cube.c b/demos/cube.c index bb07c186..e64bf0a7 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -515,8 +515,8 @@ static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf) .renderArea.offset.y = 0, .renderArea.extent.width = demo->width, .renderArea.extent.height = demo->height, - .attachmentCount = 2, - .pAttachmentClearValues = clear_values, + .clearValueCount = 2, + .pClearValues = clear_values, }; VkResult U_ASSERT_ONLY err; diff --git a/demos/tri.c b/demos/tri.c index b9e4e02b..1a4e5b32 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -355,8 +355,8 @@ static void demo_draw_build_cmd(struct demo *demo) .renderArea.offset.y = 0, .renderArea.extent.width = demo->width, .renderArea.extent.height = demo->height, - .attachmentCount = 2, - .pAttachmentClearValues = clear_values, + .clearValueCount = 2, + .pClearValues = clear_values, }; VkResult U_ASSERT_ONLY err; diff --git a/include/vulkan.h b/include/vulkan.h index bb70391b..e74a99fb 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,7 +41,7 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 143, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 144, 0) #define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj; @@ -2016,8 +2016,8 @@ typedef struct { VkRenderPass renderPass; VkFramebuffer framebuffer; VkRect2D renderArea; - uint32_t attachmentCount; - const VkClearValue* pAttachmentClearValues; + uint32_t clearValueCount; + const VkClearValue* pClearValues; } VkRenderPassBeginInfo; typedef struct { diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 81acf898..59f34708 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -8100,7 +8100,7 @@ bool PreCmdBeginRenderPass( "vkCmdBeginRenderPass parameter, VkStructureType pRenderPassBegin->sType, is an invalid enumerator"); return false; } - if(pRenderPassBegin->pAttachmentClearValues != nullptr) + if(pRenderPassBegin->pClearValues != nullptr) { } } -- cgit v1.2.3