commit e3105972bfdc54e2cca65acf44d4ffa8d85881f5
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 0aca6da85902e410ee7b100b58876dd0369ec848
parent 1e16cb80a60551f41801f2951795951217b3aeaa

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

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

tests/render_tests.cpp

diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 70d53eb..197e4a4 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -4151,11 +4151,10 @@
 
     /* clear via load op to full green */
     m_clear_via_load_op = true;
-    m_clear_color.useRawValue = false;
-    m_clear_color.color.floatColor[0] = 0;
-    m_clear_color.color.floatColor[1] = 1;
-    m_clear_color.color.floatColor[2] = 0;
-    m_clear_color.color.floatColor[3] = 0;
+    m_clear_color.f32[0] = 0;
+    m_clear_color.f32[1] = 1;
+    m_clear_color.f32[2] = 0;
+    m_clear_color.f32[3] = 0;
     ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
 
     VkCommandBufferObj cmdBuffer(m_device);
@@ -4175,11 +4174,10 @@
 
     /* clear via load op to full red */
     m_clear_via_load_op = true;
-    m_clear_color.useRawValue = false;
-    m_clear_color.color.floatColor[0] = 1;
-    m_clear_color.color.floatColor[1] = 0;
-    m_clear_color.color.floatColor[2] = 0;
-    m_clear_color.color.floatColor[3] = 0;
+    m_clear_color.f32[0] = 1;
+    m_clear_color.f32[1] = 0;
+    m_clear_color.f32[2] = 0;
+    m_clear_color.f32[3] = 0;
     ASSERT_NO_FATAL_FAILURE(InitRenderTarget());
 
     VkCommandBufferObj cmdBuffer(m_device);
@@ -4193,12 +4191,11 @@
     /* Now, partway through this renderpass we want to clear the color
      * attachment again, this time to green.
      */
-    VkClearColor clear_color;
-    clear_color.useRawValue = false;
-    clear_color.color.floatColor[0] = 0;
-    clear_color.color.floatColor[1] = 1;
-    clear_color.color.floatColor[2] = 0;
-    clear_color.color.floatColor[3] = 0;
+    VkClearColorValue clear_color;
+    clear_color.f32[0] = 0;
+    clear_color.f32[1] = 1;
+    clear_color.f32[2] = 0;
+    clear_color.f32[3] = 0;
     VkRect3D clear_rect = { { 0, 0, 0 }, { (int)m_width, (int)m_height, 1 } };
     vkCmdClearColorAttachment(cmdBuffer.obj(), 0,
                               VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,