From a11f319fe4657cb2aeb4edc2a138a182c0367e09 Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtney@LunarG.com>
Date: Fri, 11 Sep 2015 11:40:48 -0600
Subject: vulkan: Add missing _BIT to some bitfield enums.

Merge request #290 (https://gitlab.khronos.org/vulkan/vulkan/merge_requests/290)
---
 include/vulkan.h         | 20 ++++++++++----------
 layers/param_checker.cpp | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/vulkan.h b/include/vulkan.h
index f3112cdc..917edc06 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -873,13 +873,13 @@ typedef enum {
 typedef VkFlags VkImageCreateFlags;
 
 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,
+    VK_SAMPLE_COUNT_1_BIT = 0x00000001,
+    VK_SAMPLE_COUNT_2_BIT = 0x00000002,
+    VK_SAMPLE_COUNT_4_BIT = 0x00000004,
+    VK_SAMPLE_COUNT_8_BIT = 0x00000008,
+    VK_SAMPLE_COUNT_16_BIT = 0x00000010,
+    VK_SAMPLE_COUNT_32_BIT = 0x00000020,
+    VK_SAMPLE_COUNT_64_BIT = 0x00000040,
 } VkSampleCountFlagBits;
 typedef VkFlags VkSampleCountFlags;
 
@@ -903,7 +903,7 @@ typedef enum {
 typedef VkFlags VkMemoryPropertyFlags;
 
 typedef enum {
-    VK_MEMORY_HEAP_HOST_LOCAL = 0x00000001,
+    VK_MEMORY_HEAP_HOST_LOCAL_BIT = 0x00000001,
 } VkMemoryHeapFlagBits;
 typedef VkFlags VkMemoryHeapFlags;
 typedef VkFlags VkMemoryMapFlags;
@@ -1069,7 +1069,7 @@ typedef enum {
 typedef VkFlags VkCmdPoolCreateFlags;
 
 typedef enum {
-    VK_CMD_POOL_RESET_RELEASE_RESOURCES = 0x00000001,
+    VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT = 0x00000001,
 } VkCmdPoolResetFlagBits;
 typedef VkFlags VkCmdPoolResetFlags;
 typedef VkFlags VkCmdBufferCreateFlags;
@@ -1084,7 +1084,7 @@ typedef enum {
 typedef VkFlags VkCmdBufferOptimizeFlags;
 
 typedef enum {
-    VK_CMD_BUFFER_RESET_RELEASE_RESOURCES = 0x00000001,
+    VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT = 0x00000001,
 } VkCmdBufferResetFlagBits;
 typedef VkFlags VkCmdBufferResetFlags;
 
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 3c27fd09..6458d164 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -591,7 +591,7 @@ std::string EnumeratorString(VkMemoryPropertyFlagBits const& enumerator)
 static
 bool ValidateEnumerator(VkMemoryHeapFlagBits const& enumerator)
 {
-    VkMemoryHeapFlagBits allFlags = (VkMemoryHeapFlagBits)(VK_MEMORY_HEAP_HOST_LOCAL);
+    VkMemoryHeapFlagBits allFlags = (VkMemoryHeapFlagBits)(VK_MEMORY_HEAP_HOST_LOCAL_BIT);
     if(enumerator & (~allFlags))
     {
         return false;
@@ -609,9 +609,9 @@ std::string EnumeratorString(VkMemoryHeapFlagBits const& enumerator)
     }
 
     std::vector<std::string> strings;
-    if(enumerator & VK_MEMORY_HEAP_HOST_LOCAL)
+    if(enumerator & VK_MEMORY_HEAP_HOST_LOCAL_BIT)
     {
-        strings.push_back("VK_MEMORY_HEAP_HOST_LOCAL");
+        strings.push_back("VK_MEMORY_HEAP_HOST_LOCAL_BIT");
     }
 
     std::string enumeratorString;
@@ -1671,7 +1671,7 @@ std::string EnumeratorString(VkCmdPoolCreateFlagBits const& enumerator)
 static
 bool ValidateEnumerator(VkCmdPoolResetFlagBits const& enumerator)
 {
-    VkCmdPoolResetFlagBits allFlags = (VkCmdPoolResetFlagBits)(VK_CMD_POOL_RESET_RELEASE_RESOURCES);
+    VkCmdPoolResetFlagBits allFlags = (VkCmdPoolResetFlagBits)(VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT);
     if(enumerator & (~allFlags))
     {
         return false;
@@ -1689,9 +1689,9 @@ std::string EnumeratorString(VkCmdPoolResetFlagBits const& enumerator)
     }
 
     std::vector<std::string> strings;
-    if(enumerator & VK_CMD_POOL_RESET_RELEASE_RESOURCES)
+    if(enumerator & VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT)
     {
-        strings.push_back("VK_CMD_POOL_RESET_RELEASE_RESOURCES");
+        strings.push_back("VK_CMD_POOL_RESET_RELEASE_RESOURCES_BIT");
     }
 
     std::string enumeratorString;
@@ -1771,7 +1771,7 @@ std::string EnumeratorString(VkCmdBufferOptimizeFlagBits const& enumerator)
 static
 bool ValidateEnumerator(VkCmdBufferResetFlagBits const& enumerator)
 {
-    VkCmdBufferResetFlagBits allFlags = (VkCmdBufferResetFlagBits)(VK_CMD_BUFFER_RESET_RELEASE_RESOURCES);
+    VkCmdBufferResetFlagBits allFlags = (VkCmdBufferResetFlagBits)(VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT);
     if(enumerator & (~allFlags))
     {
         return false;
@@ -1789,9 +1789,9 @@ std::string EnumeratorString(VkCmdBufferResetFlagBits const& enumerator)
     }
 
     std::vector<std::string> strings;
-    if(enumerator & VK_CMD_BUFFER_RESET_RELEASE_RESOURCES)
+    if(enumerator & VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT)
     {
-        strings.push_back("VK_CMD_BUFFER_RESET_RELEASE_RESOURCES");
+        strings.push_back("VK_CMD_BUFFER_RESET_RELEASE_RESOURCES_BIT");
     }
 
     std::string enumeratorString;
-- 
cgit v1.2.3