v155: Bug 14435 - Remove abbreviations in VkClearColor
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index e0ac030..2fcffb3 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -1168,16 +1168,16 @@
// TODO support all formats
switch (format) {
case VK_FORMAT_R8G8B8A8_UNORM:
- raw.push_back((uint8_t)(color.f32[0] * 255.0f));
- raw.push_back((uint8_t)(color.f32[1] * 255.0f));
- raw.push_back((uint8_t)(color.f32[2] * 255.0f));
- raw.push_back((uint8_t)(color.f32[3] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[0] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[1] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[2] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[3] * 255.0f));
break;
case VK_FORMAT_B8G8R8A8_UNORM:
- raw.push_back((uint8_t)(color.f32[2] * 255.0f));
- raw.push_back((uint8_t)(color.f32[1] * 255.0f));
- raw.push_back((uint8_t)(color.f32[0] * 255.0f));
- raw.push_back((uint8_t)(color.f32[3] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[2] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[1] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[0] * 255.0f));
+ raw.push_back((uint8_t)(color.float32[3] * 255.0f));
break;
default:
break;
@@ -1265,7 +1265,7 @@
const std::vector<VkImageSubresourceRange> &ranges)
{
VkClearColorValue c = {};
- memcpy(c.f32, color, sizeof(c.f32));
+ memcpy(c.float32, color, sizeof(c.float32));
test_clear_color_image(img_info, c, ranges);
}
};
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 20e364c..34b0b41 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2073,10 +2073,10 @@
// Main thing we care about for this test is that the VkImage obj we're clearing matches Color Attachment of FB
// Also pass down other dummy params to keep driver and paramchecker happy
VkClearColorValue cCV;
- cCV.f32[0] = 1.0;
- cCV.f32[1] = 1.0;
- cCV.f32[2] = 1.0;
- cCV.f32[3] = 1.0;
+ cCV.float32[0] = 1.0;
+ cCV.float32[1] = 1.0;
+ cCV.float32[2] = 1.0;
+ cCV.float32[3] = 1.0;
vkCmdClearColorAttachment(m_cmdBuffer->GetBufferHandle(), 0, (VkImageLayout)NULL, &cCV, 0, NULL);
msgFlags = m_errorMonitor->GetState(&msgString);
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 49fbf4c..4e1c1d7 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -4127,10 +4127,10 @@
/* clear via load op to full green */
m_clear_via_load_op = true;
- m_clear_color.f32[0] = 0;
- m_clear_color.f32[1] = 1;
- m_clear_color.f32[2] = 0;
- m_clear_color.f32[3] = 0;
+ m_clear_color.float32[0] = 0;
+ m_clear_color.float32[1] = 1;
+ m_clear_color.float32[2] = 0;
+ m_clear_color.float32[3] = 0;
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
ASSERT_VK_SUCCESS(BeginCommandBuffer());
/* This command buffer contains ONLY the load op! */
@@ -4147,10 +4147,10 @@
/* clear via load op to full red */
m_clear_via_load_op = true;
- m_clear_color.f32[0] = 1;
- m_clear_color.f32[1] = 0;
- m_clear_color.f32[2] = 0;
- m_clear_color.f32[3] = 0;
+ m_clear_color.float32[0] = 1;
+ m_clear_color.float32[1] = 0;
+ m_clear_color.float32[2] = 0;
+ m_clear_color.float32[3] = 0;
ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
ASSERT_VK_SUCCESS(BeginCommandBuffer());
@@ -4162,10 +4162,10 @@
* attachment again, this time to green.
*/
VkClearColorValue clear_color;
- clear_color.f32[0] = 0;
- clear_color.f32[1] = 1;
- clear_color.f32[2] = 0;
- clear_color.f32[3] = 0;
+ clear_color.float32[0] = 0;
+ clear_color.float32[1] = 1;
+ clear_color.float32[2] = 0;
+ clear_color.float32[3] = 0;
VkRect3D clear_rect = { { 0, 0, 0 }, { (int)m_width, (int)m_height, 1 } };
vkCmdClearColorAttachment(m_cmdBuffer->handle(), 0,
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 6962fa0..025e9ec 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -64,10 +64,10 @@
m_renderPassBeginInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
// clear the back buffer to dark grey
- m_clear_color.f32[0] = 0.25f;
- m_clear_color.f32[1] = 0.25f;
- m_clear_color.f32[2] = 0.25f;
- m_clear_color.f32[3] = 0.0f;
+ m_clear_color.float32[0] = 0.25f;
+ m_clear_color.float32[1] = 0.25f;
+ m_clear_color.float32[2] = 0.25f;
+ m_clear_color.float32[3] = 0.0f;
}
VkRenderFramework::~VkRenderFramework()
@@ -396,8 +396,8 @@
att.stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE;
attachments.push_back(att);
- clear.ds.depth = m_depth_clear_color;
- clear.ds.stencil = m_stencil_clear_color;
+ clear.depthStencil.depth = m_depth_clear_color;
+ clear.depthStencil.stencil = m_stencil_clear_color;
m_renderPassClearValues.push_back(clear);
bindings.push_back(*dsBinding);