From 407b8cc5e0e0e0382b7a350480a7654fcb2a164f Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 1 Dec 2015 12:19:11 -0800
Subject: [PATCH] vk/0.210.0: Get rid of VkImageAspect

---
 include/vulkan/vulkan.h | 13 +------------
 src/vulkan/anv_dump.c   |  2 +-
 src/vulkan/anv_image.c  | 12 +++++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 0a28ade4a25..cae02065ad1 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -409,17 +409,6 @@ typedef enum VkPhysicalDeviceType {
     VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkPhysicalDeviceType;
 
-typedef enum {
-    VK_IMAGE_ASPECT_COLOR = 0,
-    VK_IMAGE_ASPECT_DEPTH = 1,
-    VK_IMAGE_ASPECT_STENCIL = 2,
-    VK_IMAGE_ASPECT_METADATA = 3,
-    VK_IMAGE_ASPECT_BEGIN_RANGE = VK_IMAGE_ASPECT_COLOR,
-    VK_IMAGE_ASPECT_END_RANGE = VK_IMAGE_ASPECT_METADATA,
-    VK_IMAGE_ASPECT_NUM = (VK_IMAGE_ASPECT_METADATA - VK_IMAGE_ASPECT_COLOR + 1),
-    VK_IMAGE_ASPECT_MAX_ENUM = 0x7FFFFFFF
-} VkImageAspect;
-
 typedef enum VkQueryType {
     VK_QUERY_TYPE_OCCLUSION = 0,
     VK_QUERY_TYPE_PIPELINE_STATISTICS = 1,
@@ -1420,7 +1409,7 @@ typedef struct VkSparseImageOpaqueMemoryBindInfo {
 } VkSparseImageOpaqueMemoryBindInfo;
 
 typedef struct VkImageSubresource {
-    VkImageAspect                               aspect;
+    VkImageAspectFlags                          aspectMask;
     uint32_t                                    mipLevel;
     uint32_t                                    arrayLayer;
 } VkImageSubresource;
diff --git a/src/vulkan/anv_dump.c b/src/vulkan/anv_dump.c
index b2d0b385d0a..b232f6b206b 100644
--- a/src/vulkan/anv_dump.c
+++ b/src/vulkan/anv_dump.c
@@ -178,7 +178,7 @@ anv_dump_image_to_ppm(struct anv_device *device,
    VkSubresourceLayout layout;
    anv_GetImageSubresourceLayout(vk_device, copy_image,
       &(VkImageSubresource) {
-         .aspect = VK_IMAGE_ASPECT_COLOR,
+         .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
          .mipLevel = 0,
          .arrayLayer = 0,
       }, &layout);
diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c
index 0fe2df10a7a..6c39b355958 100644
--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -430,16 +430,18 @@ void anv_GetImageSubresourceLayout(
 {
    ANV_FROM_HANDLE(anv_image, image, _image);
 
-   switch (pSubresource->aspect) {
-   case VK_IMAGE_ASPECT_COLOR:
+   assert(__builtin_popcount(pSubresource->aspectMask) == 1);
+
+   switch (pSubresource->aspectMask) {
+   case VK_IMAGE_ASPECT_COLOR_BIT:
       anv_surface_get_subresource_layout(image, &image->color_surface,
                                          pSubresource, pLayout);
       break;
-   case VK_IMAGE_ASPECT_DEPTH:
+   case VK_IMAGE_ASPECT_DEPTH_BIT:
       anv_surface_get_subresource_layout(image, &image->depth_surface,
                                          pSubresource, pLayout);
       break;
-   case VK_IMAGE_ASPECT_STENCIL:
+   case VK_IMAGE_ASPECT_STENCIL_BIT:
       anv_surface_get_subresource_layout(image, &image->stencil_surface,
                                          pSubresource, pLayout);
       break;
@@ -520,7 +522,7 @@ anv_validate_CreateImageView(VkDevice _device,
                 image->format->isl_layout->bs);
       }
 
-      if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL) {
+      if (subresource->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {
          /* FINISHME: Is it legal to have an R8 view of S8? */
          assert(image->format->has_stencil);
          assert(view_format_info->has_stencil);
-- 
2.30.2