commit 4291d8822ec2a685ef89ec2b210ff16857e25310
author Chia-I Wu <olv@lunarg.com> Tue Oct 27 19:00:15 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Nov 02 15:04:09 2015 -0700
tree 5255629431741260f5fece02ee6ef7fa5d47b0bd
parent c51b121913d6f21ccefb3f7595178d3c87e11de4

bug 14918 part 4: more cleanups (WIP)

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index a73f2d1..fd7644e 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -845,7 +845,7 @@
             .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
             .pNext = NULL,
             .format = demo->format,
-            .channels = {
+            .components = {
                 .r = VK_COMPONENT_SWIZZLE_R,
                 .g = VK_COMPONENT_SWIZZLE_G,
                 .b = VK_COMPONENT_SWIZZLE_B,
@@ -1196,7 +1196,7 @@
             .image = VK_NULL_HANDLE,
             .viewType = VK_IMAGE_VIEW_TYPE_2D,
             .format = tex_format,
-            .channels = { VK_COMPONENT_SWIZZLE_R,
+            .components = { VK_COMPONENT_SWIZZLE_R,
                           VK_COMPONENT_SWIZZLE_G,
                           VK_COMPONENT_SWIZZLE_B,
                           VK_COMPONENT_SWIZZLE_A, },

demos/tri.c

diff --git a/demos/tri.c b/demos/tri.c
index e1035fb..39e68db 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -653,7 +653,7 @@
             .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
             .pNext = NULL,
             .format = demo->format,
-            .channels = {
+            .components = {
                 .r = VK_COMPONENT_SWIZZLE_R,
                 .g = VK_COMPONENT_SWIZZLE_G,
                 .b = VK_COMPONENT_SWIZZLE_B,
@@ -954,7 +954,7 @@
             .image = VK_NULL_HANDLE,
             .viewType = VK_IMAGE_VIEW_TYPE_2D,
             .format = tex_format,
-            .channels = { VK_COMPONENT_SWIZZLE_R,
+            .components = { VK_COMPONENT_SWIZZLE_R,
                           VK_COMPONENT_SWIZZLE_G,
                           VK_COMPONENT_SWIZZLE_B,
                           VK_COMPONENT_SWIZZLE_A, },

demos/vulkaninfo.c

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 01ff3dd..e18c67d 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -758,7 +758,7 @@
     printf("\tmultiDrawIndirect                       = %u\n", features->multiDrawIndirect                      );
     printf("\tdepthClamp                              = %u\n", features->depthClamp                             );
     printf("\tdepthBiasClamp                          = %u\n", features->depthBiasClamp                         );
-    printf("\tpolygonModeNonSolid                        = %u\n", features->polygonModeNonSolid                       );
+    printf("\tfillModeNonSolid                        = %u\n", features->fillModeNonSolid                       );
     printf("\tdepthBounds                             = %u\n", features->depthBounds                            );
     printf("\twideLines                               = %u\n", features->wideLines                              );
     printf("\tlargePoints                             = %u\n", features->largePoints                            );