From a014143f876c5ac5c5c7a1cea56f7cacaf3a5cb7 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Tue, 27 Oct 2015 19:55:05 +0800
Subject: bug 15000: aspect/aspectMask inconsistencies (WIP)

Rename all aspect to aspectMask.

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15000
---
 include/vulkan.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/vulkan.h b/include/vulkan.h
index efedb8cf..a819d9b4 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -832,6 +832,7 @@ typedef enum {
     VK_IMAGE_ASPECT_STENCIL_BIT = 0x00000004,
     VK_IMAGE_ASPECT_METADATA_BIT = 0x00000008,
 } VkImageAspectFlagBits;
+typedef VkFlags VkImageAspectFlags;
 
 typedef enum {
     VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT = 0x00000001,
@@ -894,7 +895,6 @@ typedef enum {
 typedef VkFlags VkBufferUsageFlags;
 typedef VkFlags VkBufferViewCreateFlags;
 typedef VkFlags VkImageViewCreateFlags;
-typedef VkFlags VkImageAspectFlags;
 typedef VkFlags VkShaderModuleCreateFlags;
 typedef VkFlags VkShaderCreateFlags;
 
@@ -1393,7 +1393,7 @@ typedef struct {
 } VkMemoryRequirements;
 
 typedef struct {
-    VkImageAspectFlagBits                       aspect;
+    VkImageAspectFlags                          aspectMask;
     VkExtent3D                                  imageGranularity;
     VkSparseImageFormatFlags                    flags;
 } VkSparseImageFormatProperties;
@@ -1427,7 +1427,7 @@ typedef struct {
 } VkSparseImageOpaqueMemoryBindInfo;
 
 typedef struct {
-    VkImageAspectFlagBits                       aspect;
+    VkImageAspectFlags                          aspectMask;
     uint32_t                                    mipLevel;
     uint32_t                                    arrayLayer;
 } VkImageSubresource;
-- 
cgit v1.2.3