commit 195c9e1571bc33a143af6a1adf7f6083a3b41f8d
author Chia-I Wu <olv@lunarg.com> Tue Oct 27 19:55:05 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Nov 02 15:04:09 2015 -0700
tree 7ff6e47c08ab358568d2272062be9c8fd6672eed
parent 989de845e6627fecee8dceef882955149b7538ba

bug 15000: aspect/aspectMask inconsistencies (WIP)

Rename all aspect to aspectMask.

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15000

layers/image.cpp

diff --git a/layers/image.cpp b/layers/image.cpp
index 5420d4f..c84fa9c 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -911,17 +911,17 @@
     if (imageEntry != device_data->imageMap.end()) {
         format = imageEntry->second.format;
         if (vk_format_is_color(format)) {
-            if (pSubresource->aspect != VK_IMAGE_ASPECT_COLOR_BIT) {
+            if (pSubresource->aspectMask != VK_IMAGE_ASPECT_COLOR_BIT) {
                 std::stringstream ss;
-                ss << "vkGetImageSubresourceLayout: For color formats, the aspect field of VkImageSubresource must be VK_IMAGE_ASPECT_COLOR.";
+                ss << "vkGetImageSubresourceLayout: For color formats, the aspectMask field of VkImageSubresource must be VK_IMAGE_ASPECT_COLOR.";
                 skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE,
                                    (uint64_t)image, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str());
             }
         } else if (vk_format_is_depth_or_stencil(format)) {
-            if ((pSubresource->aspect != VK_IMAGE_ASPECT_DEPTH_BIT) &&
-                (pSubresource->aspect != VK_IMAGE_ASPECT_STENCIL_BIT)) {
+            if ((pSubresource->aspectMask != VK_IMAGE_ASPECT_DEPTH_BIT) &&
+                (pSubresource->aspectMask != VK_IMAGE_ASPECT_STENCIL_BIT)) {
                 std::stringstream ss;
-                ss << "vkGetImageSubresourceLayout: For depth/stencil formats, the aspect selects either the depth or stencil image aspect.";
+                ss << "vkGetImageSubresourceLayout: For depth/stencil formats, the aspectMask selects either the depth or stencil image aspectMask.";
                 skipCall |= log_msg(device_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE,
                                    (uint64_t)image, 0, IMAGE_INVALID_IMAGE_ASPECT, "IMAGE", ss.str().c_str());
             }

layers/param_checker.cpp

diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index ad1f2e8..0aff450 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -2492,11 +2492,11 @@
 
     if(pSparseMemoryRequirements != nullptr)
     {
-    if ((pSparseMemoryRequirements->formatProperties.aspect &
+    if ((pSparseMemoryRequirements->formatProperties.aspectMask &
        (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkGetImageSparseMemoryRequirements parameter, VkImageAspect pSparseMemoryRequirements->formatProperties.aspect, is an unrecognized enumerator");
+        "vkGetImageSparseMemoryRequirements parameter, VkImageAspect pSparseMemoryRequirements->formatProperties.aspectMask, is an unrecognized enumerator");
         return false;
     }
     }
@@ -2558,11 +2558,11 @@
 
     if(pProperties != nullptr)
     {
-    if ((pProperties->aspect &
+    if ((pProperties->aspectMask &
        (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0)
     {
         log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkGetPhysicalDeviceSparseImageFormatProperties parameter, VkImageAspect pProperties->aspect, is an unrecognized enumerator");
+        "vkGetPhysicalDeviceSparseImageFormatProperties parameter, VkImageAspect pProperties->aspectMask, is an unrecognized enumerator");
         return false;
     }
     }
@@ -3306,11 +3306,11 @@
 {
     if(pSubresource != nullptr)
     {
-    if ((pSubresource->aspect &
+    if ((pSubresource->aspectMask &
        (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_METADATA_BIT)) == 0)
     {
         log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkGetImageSubresourceLayout parameter, VkImageAspect pSubresource->aspect, is an unrecognized enumerator");
+        "vkGetImageSubresourceLayout parameter, VkImageAspect pSubresource->aspectMask, is an unrecognized enumerator");
         return false;
     }
     }