commit ab83a0e222713e730a8f2878a5e4dfdccbab5b85
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 1961f0bfbd6b356d465dd0c258d8b072a7c916b0
parent 1b99bb2b9a5894e196bac24e37ac2258551a04ba

bug 14918 part 4: more cleanups (WIP)

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index cb55b1a..5326380 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -235,7 +235,7 @@
     memset(&query_info, 0, sizeof(query_info));
     query_info.sType = VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
     query_info.queryType = VK_QUERY_TYPE_OCCLUSION;
-    query_info.slots = MAX_QUERY_SLOTS;
+    query_info.entryCount = MAX_QUERY_SLOTS;
 
     //        VkResult VKAPI vkCreateQueryPool(
     //            VkDevice                                  device,
@@ -447,10 +447,10 @@
     viewInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
     viewInfo.format = fmt;
 
-    viewInfo.channels.r = VK_COMPONENT_SWIZZLE_R;
-    viewInfo.channels.g = VK_COMPONENT_SWIZZLE_G;
-    viewInfo.channels.b = VK_COMPONENT_SWIZZLE_B;
-    viewInfo.channels.a = VK_COMPONENT_SWIZZLE_A;
+    viewInfo.components.r = VK_COMPONENT_SWIZZLE_R;
+    viewInfo.components.g = VK_COMPONENT_SWIZZLE_G;
+    viewInfo.components.b = VK_COMPONENT_SWIZZLE_B;
+    viewInfo.components.a = VK_COMPONENT_SWIZZLE_A;
 
     viewInfo.subresourceRange.baseArrayLayer = 0;
     viewInfo.subresourceRange.layerCount = 1;