From eb1f6d4287dfd4907a29c1b4eab2b0ad15376c37 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Thu, 10 Sep 2015 13:28:52 -0600
Subject: Bug 14537: Improve VkImageFormatProperties

Commit: e45df2e
---
 include/vulkan.h | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'include/vulkan.h')

diff --git a/include/vulkan.h b/include/vulkan.h
index 25ceceaf..092a086b 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -864,6 +864,16 @@ typedef enum {
 } VkImageUsageFlagBits;
 typedef VkFlags VkImageUsageFlags;
 
+typedef enum {
+    VK_IMAGE_CREATE_SPARSE_BIT = 0x00000001,
+    VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT = 0x00000002,
+    VK_IMAGE_CREATE_SPARSE_ALIASED_BIT = 0x00000004,
+    VK_IMAGE_CREATE_INVARIANT_DATA_BIT = 0x00000008,
+    VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000010,
+    VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000020,
+} VkImageCreateFlagBits;
+typedef VkFlags VkImageCreateFlags;
+
 typedef enum {
     VK_SAMPLE_COUNT_1 = 0x00000001,
     VK_SAMPLE_COUNT_2 = 0x00000002,
@@ -963,16 +973,6 @@ typedef enum {
 } VkBufferCreateFlagBits;
 typedef VkFlags VkBufferCreateFlags;
 
-typedef enum {
-    VK_IMAGE_CREATE_SPARSE_BIT = 0x00000001,
-    VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT = 0x00000002,
-    VK_IMAGE_CREATE_SPARSE_ALIASED_BIT = 0x00000004,
-    VK_IMAGE_CREATE_INVARIANT_DATA_BIT = 0x00000008,
-    VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT = 0x00000010,
-    VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT = 0x00000020,
-} VkImageCreateFlagBits;
-typedef VkFlags VkImageCreateFlags;
-
 typedef enum {
     VK_IMAGE_VIEW_CREATE_READ_ONLY_DEPTH_BIT = 0x00000001,
     VK_IMAGE_VIEW_CREATE_READ_ONLY_STENCIL_BIT = 0x00000002,
@@ -1195,8 +1195,17 @@ typedef struct {
 } VkFormatProperties;
 
 typedef struct {
+    int32_t                                     width;
+    int32_t                                     height;
+    int32_t                                     depth;
+} VkExtent3D;
+
+typedef struct {
+    VkExtent3D                                  maxExtent;
+    uint32_t                                    maxMipLevels;
+    uint32_t                                    maxArraySize;
     VkSampleCountFlags                          sampleCounts;
-    uint64_t                                    maxResourceSize;
+    VkDeviceSize                                maxResourceSize;
 } VkImageFormatProperties;
 
 typedef struct {
@@ -1390,12 +1399,6 @@ typedef struct {
     uint32_t                                    memoryTypeBits;
 } VkMemoryRequirements;
 
-typedef struct {
-    int32_t                                     width;
-    int32_t                                     height;
-    int32_t                                     depth;
-} VkExtent3D;
-
 typedef struct {
     VkImageAspect                               aspect;
     VkExtent3D                                  imageGranularity;
-- 
cgit v1.2.3