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)

layers/image.cpp

diff --git a/layers/image.cpp b/layers/image.cpp
index f63a9af..5420d4f 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -552,13 +552,13 @@
                                 (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str);
         }
 
-        if (pRegions[i].srcSubresource.aspect != pRegions[i].dstSubresource.aspect) {
+        if (pRegions[i].srcSubresource.aspectMask != pRegions[i].dstSubresource.aspectMask) {
             char const str[] = "vkCmdCopyImage: Src and dest aspectMasks for each region must match";
             skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER,
                                 (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str);
         }
-        if ((pRegions[i].srcSubresource.aspect & VK_IMAGE_ASPECT_COLOR_BIT) &&
-            (pRegions[i].srcSubresource.aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) {
+        if ((pRegions[i].srcSubresource.aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) &&
+            (pRegions[i].srcSubresource.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) {
             char const str[] = "vkCmdCopyImage aspectMask cannot specify both COLOR and DEPTH/STENCIL aspects";
             skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER,
                                 (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str);
@@ -653,10 +653,10 @@
                                 (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str);
         }
 
-        VkImageAspectFlags aspect = pRegions[i].imageSubresource.aspect;
-        if ((aspect != VK_IMAGE_ASPECT_COLOR_BIT) &&
-            (aspect != VK_IMAGE_ASPECT_DEPTH_BIT) &&
-            (aspect != VK_IMAGE_ASPECT_STENCIL_BIT)) {
+        VkImageAspectFlags aspectMask = pRegions[i].imageSubresource.aspectMask;
+        if ((aspectMask != VK_IMAGE_ASPECT_COLOR_BIT) &&
+            (aspectMask != VK_IMAGE_ASPECT_DEPTH_BIT) &&
+            (aspectMask != VK_IMAGE_ASPECT_STENCIL_BIT)) {
             char const str[] = "vkCmdCopyImageToBuffer: aspectMasks for each region must specify only COLOR or DEPTH or STENCIL";
             skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER,
                                 (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str);
@@ -689,10 +689,10 @@
                                 (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str);
         }
 
-        VkImageAspectFlags aspect = pRegions[i].imageSubresource.aspect;
-        if ((aspect != VK_IMAGE_ASPECT_COLOR_BIT) &&
-            (aspect != VK_IMAGE_ASPECT_DEPTH_BIT) &&
-            (aspect != VK_IMAGE_ASPECT_STENCIL_BIT)) {
+        VkImageAspectFlags aspectMask = pRegions[i].imageSubresource.aspectMask;
+        if ((aspectMask != VK_IMAGE_ASPECT_COLOR_BIT) &&
+            (aspectMask != VK_IMAGE_ASPECT_DEPTH_BIT) &&
+            (aspectMask != VK_IMAGE_ASPECT_STENCIL_BIT)) {
             char const str[] = "vkCmdCopyBufferToImage: aspectMasks for each region must specify only COLOR or DEPTH or STENCIL";
             skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER,
                                 (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str);
@@ -772,8 +772,8 @@
                                         (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str);
                 }
 
-                VkImageAspectFlags srcAspect = pRegions[i].srcSubresource.aspect;
-                VkImageAspectFlags dstAspect = pRegions[i].dstSubresource.aspect;
+                VkImageAspectFlags srcAspect = pRegions[i].srcSubresource.aspectMask;
+                VkImageAspectFlags dstAspect = pRegions[i].dstSubresource.aspectMask;
 
                 if (srcAspect != dstAspect) {
                     std::stringstream ss;
@@ -857,8 +857,8 @@
                                 (uint64_t)commandBuffer, 0, IMAGE_MISMATCHED_IMAGE_ASPECT, "IMAGE", str);
         }
 
-        if ((pRegions[i].srcSubresource.aspect  != VK_IMAGE_ASPECT_COLOR_BIT) ||
-            (pRegions[i].dstSubresource.aspect != VK_IMAGE_ASPECT_COLOR_BIT)) {
+        if ((pRegions[i].srcSubresource.aspectMask  != VK_IMAGE_ASPECT_COLOR_BIT) ||
+            (pRegions[i].dstSubresource.aspectMask != VK_IMAGE_ASPECT_COLOR_BIT)) {
             char const str[] = "vkCmdResolveImage: src and dest aspectMasks for each region must specify only VK_IMAGE_ASPECT_COLOR_BIT";
             skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER,
                                 (uint64_t)commandBuffer, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", str);