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/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 75e474f..5046786 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -759,13 +759,13 @@
     this->SetLayout(&cmd_buf, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 
     VkImageCopy copy_region = {};
-    copy_region.srcSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+    copy_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     copy_region.srcSubresource.baseArrayLayer = 0;
     copy_region.srcSubresource.mipLevel = 0;
     copy_region.srcOffset.x = 0;
     copy_region.srcOffset.y = 0;
     copy_region.srcOffset.z = 0;
-    copy_region.dstSubresource.aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+    copy_region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     copy_region.dstSubresource.baseArrayLayer = 0;
     copy_region.dstSubresource.mipLevel = 0;
     copy_region.dstOffset.x = 0;
@@ -815,10 +815,10 @@
     view.image = VK_NULL_HANDLE;
     view.viewType = VK_IMAGE_VIEW_TYPE_2D;
     view.format = tex_format;
-    view.channels.r = VK_COMPONENT_SWIZZLE_R;
-    view.channels.g = VK_COMPONENT_SWIZZLE_G;
-    view.channels.b = VK_COMPONENT_SWIZZLE_B;
-    view.channels.a = VK_COMPONENT_SWIZZLE_A;
+    view.components.r = VK_COMPONENT_SWIZZLE_R;
+    view.components.g = VK_COMPONENT_SWIZZLE_G;
+    view.components.b = VK_COMPONENT_SWIZZLE_B;
+    view.components.a = VK_COMPONENT_SWIZZLE_A;
     view.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     view.subresourceRange.baseMipLevel = 0;
     view.subresourceRange.levelCount = 1;