From 1e22669abcb4bb0f950f5166fb368ef7b1517460 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Thu, 10 Sep 2015 17:58:54 -0600
Subject: Bug 12998: change ImageSubresourceRange's aspect to aspectMask

---
 demos/cube.c             |  4 ++--
 demos/tri.c              |  4 ++--
 include/vulkan.h         |  2 +-
 layers/param_checker.cpp | 27 ++++++---------------------
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index 1816bc11..8f8390cd 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -788,7 +788,7 @@ static void demo_prepare_buffers(struct demo *demo)
                 .a = VK_CHANNEL_SWIZZLE_A,
             },
             .subresourceRange = {
-                .aspect = VK_IMAGE_ASPECT_COLOR,
+                .aspectMask = VK_IMAGE_ASPECT_COLOR,
                 .baseMipLevel = 0,
                 .mipLevels = 1,
                 .baseArrayLayer = 0,
@@ -841,7 +841,7 @@ static void demo_prepare_depth(struct demo *demo)
         .image.handle = VK_NULL_HANDLE,
         .format = depth_format,
         .subresourceRange = {
-            .aspect = VK_IMAGE_ASPECT_DEPTH,
+            .aspectMask = VK_IMAGE_ASPECT_DEPTH,
             .baseMipLevel = 0,
             .mipLevels = 1,
             .baseArrayLayer = 0,
diff --git a/demos/tri.c b/demos/tri.c
index 86740c4c..e03087b3 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -592,7 +592,7 @@ static void demo_prepare_buffers(struct demo *demo)
                 .a = VK_CHANNEL_SWIZZLE_A,
             },
             .subresourceRange = {
-                .aspect = VK_IMAGE_ASPECT_COLOR,
+                .aspectMask = VK_IMAGE_ASPECT_COLOR,
                 .baseMipLevel = 0,
                 .mipLevels = 1,
                 .baseArrayLayer = 0,
@@ -647,7 +647,7 @@ static void demo_prepare_depth(struct demo *demo)
         .image.handle = VK_NULL_HANDLE,
         .format = depth_format,
         .subresourceRange = {
-            .aspect = VK_IMAGE_ASPECT_DEPTH,
+            .aspectMask = VK_IMAGE_ASPECT_DEPTH,
             .baseMipLevel = 0,
             .mipLevels = 1,
             .baseArrayLayer = 0,
diff --git a/include/vulkan.h b/include/vulkan.h
index 92e578a2..5d9abf48 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1519,7 +1519,7 @@ typedef struct {
 } VkChannelMapping;
 
 typedef struct {
-    VkImageAspect                               aspect;
+    VkImageAspectFlags                          aspectMask;
     uint32_t                                    baseMipLevel;
     uint32_t                                    mipLevels;
     uint32_t                                    baseArrayLayer;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 9a623160..3c27fd09 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -3859,13 +3859,6 @@ bool PreCreateImageView(
         "vkCreateImageView parameter, VkChannelSwizzle pCreateInfo->channels.a, is an unrecognized enumerator");
         return false;
     }
-    if(pCreateInfo->subresourceRange.aspect < VK_IMAGE_ASPECT_BEGIN_RANGE ||
-        pCreateInfo->subresourceRange.aspect > VK_IMAGE_ASPECT_END_RANGE)
-    {
-        log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCreateImageView parameter, VkImageAspect pCreateInfo->subresourceRange.aspect, is an unrecognized enumerator");
-        return false;
-    }
     }
 
     return true;
@@ -6632,13 +6625,7 @@ bool PreCmdClearColorImage(
 
     if(pRanges != nullptr)
     {
-    if(pRanges->aspect < VK_IMAGE_ASPECT_BEGIN_RANGE ||
-        pRanges->aspect > VK_IMAGE_ASPECT_END_RANGE)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCmdClearColorImage parameter, VkImageAspect pRanges->aspect, is an unrecognized enumerator");
-        return false;
-    }
+        /* TODO: How should we validate pRanges->aspectMask */
     }
 
     return true;
@@ -6685,13 +6672,11 @@ bool PreCmdClearDepthStencilImage(
 {
     if(pRanges != nullptr)
     {
-    if(pRanges->aspect < VK_IMAGE_ASPECT_BEGIN_RANGE ||
-        pRanges->aspect > VK_IMAGE_ASPECT_END_RANGE)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkCmdClearDepthStencilImage parameter, VkImageAspect pRanges->aspect, is an unrecognized enumerator");
-        return false;
-    }
+        /*
+         * TODO: How do we validation pRanges->aspectMask?
+         * Allows values are: VK_IMAGE_ASPECT_DEPTH_BIT and
+         * VK_IMAGE_ASPECT_STENCIL_BIT.
+         */
     }
 
     return true;
-- 
cgit v1.2.3