From 5574592f9eae5d70da89bfe9a7ea0dee0d86f36f Mon Sep 17 00:00:00 2001
From: Cody Northrop <cody@lunarg.com>
Date: Tue, 25 Aug 2015 15:26:38 -0600
Subject: v155: Bug 14435 - Remove abbreviations in VkClearColor

---
 demos/cube.c     |  4 ++--
 demos/tri.c      |  4 ++--
 include/vulkan.h | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 5fa60007..759e6361 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -514,8 +514,8 @@ static void demo_draw_build_cmd(struct demo *demo, VkCmdBuffer cmd_buf)
         .framebuffer = VK_NULL_HANDLE,
     };
     const VkClearValue clear_values[2] = {
-        [0] = { .color.f32 = { 0.2f, 0.2f, 0.2f, 0.2f } },
-        [1] = { .ds = { 1.0f, 0 } },
+        [0] = { .color.float32 = { 0.2f, 0.2f, 0.2f, 0.2f } },
+        [1] = { .depthStencil = { 1.0f, 0 } },
     };
     const VkRenderPassBeginInfo rp_begin = {
         .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
diff --git a/demos/tri.c b/demos/tri.c
index ffc19cd5..f515ae1d 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -357,8 +357,8 @@ static void demo_draw_build_cmd(struct demo *demo)
         .framebuffer = VK_NULL_HANDLE,
     };
     const VkClearValue clear_values[2] = {
-        [0] = { .color.f32 = { 0.2f, 0.2f, 0.2f, 0.2f } },
-        [1] = { .ds = { 0.9f, 0 } },
+        [0] = { .color.float32 = { 0.2f, 0.2f, 0.2f, 0.2f } },
+        [1] = { .depthStencil = { 0.9f, 0 } },
     };
     const VkRenderPassBeginInfo rp_begin = {
         .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
diff --git a/include/vulkan.h b/include/vulkan.h
index 010123dd..b032bf7f 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, 154, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 155, 0)
 
 
 #if defined(__cplusplus) && (_MSC_VER >= 1800 || __cplusplus >= 201103L)
@@ -2013,9 +2013,9 @@ typedef struct {
 } VkBufferImageCopy;
 
 typedef union {
-    float                                       f32[4];
-    int32_t                                     s32[4];
-    uint32_t                                    u32[4];
+    float                                       float32[4];
+    int32_t                                     int32[4];
+    uint32_t                                    uint32[4];
 } VkClearColorValue;
 
 typedef struct {
@@ -2038,7 +2038,7 @@ typedef struct {
 
 typedef union {
     VkClearColorValue                           color;
-    VkClearDepthStencilValue                    ds;
+    VkClearDepthStencilValue                    depthStencil;
 } VkClearValue;
 
 typedef struct {
-- 
cgit v1.2.3