From cf4e724a30c838ad5d31c9f461755e98a199f3d6 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Wed, 2 Sep 2015 11:04:44 -0600
Subject: bug-14537: Improve VkImageFormatProperties

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14537
* Add VkSampleCountFlags that describes set of power-of-two sample
  counts (VK_SAMPLE_COUNT_N = (1<<N))

* Use VkSampleCountFlags to describe exact supported sample count set
  in VkImageFormatProperties
---
 include/vulkan.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'include/vulkan.h')

diff --git a/include/vulkan.h b/include/vulkan.h
index 744180c0..9b4db787 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -41,7 +41,7 @@ extern "C" {
     ((major << 22) | (minor << 12) | patch)
 
 // Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(0, 160, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 162, 0)
 
 
 #if defined(__cplusplus) && (_MSC_VER >= 1800 || __cplusplus >= 201103L)
@@ -885,6 +885,17 @@ typedef enum {
 } VkImageUsageFlagBits;
 typedef VkFlags VkImageUsageFlags;
 
+typedef enum {
+    VK_SAMPLE_COUNT_1 = 0x00000001,
+    VK_SAMPLE_COUNT_2 = 0x00000002,
+    VK_SAMPLE_COUNT_4 = 0x00000004,
+    VK_SAMPLE_COUNT_8 = 0x00000008,
+    VK_SAMPLE_COUNT_16 = 0x00000010,
+    VK_SAMPLE_COUNT_32 = 0x00000020,
+    VK_SAMPLE_COUNT_64 = 0x00000040,
+} VkSampleCountFlagBits;
+typedef VkFlags VkSampleCountFlags;
+
 typedef enum {
     VK_QUEUE_GRAPHICS_BIT = 0x00000001,
     VK_QUEUE_COMPUTE_BIT = 0x00000002,
@@ -1210,8 +1221,8 @@ typedef struct {
 } VkFormatProperties;
 
 typedef struct {
+    VkSampleCountFlags                          sampleCounts;
     uint64_t                                    maxResourceSize;
-    uint32_t                                    maxSamples;
 } VkImageFormatProperties;
 
 typedef struct {
@@ -1220,6 +1231,7 @@ typedef struct {
     uint32_t                                    maxImageDimension3D;
     uint32_t                                    maxImageDimensionCube;
     uint32_t                                    maxImageArrayLayers;
+    VkSampleCountFlags                          sampleCounts;
     uint32_t                                    maxTexelBufferSize;
     uint32_t                                    maxUniformBufferSize;
     uint32_t                                    maxStorageBufferSize;
-- 
cgit v1.2.3