vk: Reformat a bunch of enums
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 6 Jul 2015 23:41:31 +0000 (16:41 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Mon, 6 Jul 2015 23:41:31 +0000 (16:41 -0700)
This accounts for a number differences between the generated headers and
the hand-written header.  Not all reformatting is done in this commit but
it does make the headers much more diffable.

In theory, no functional change.

include/vulkan/vulkan.h

index 196f582e75aa2b827568b8cc17959f7be70111bb..7c3aae9d344ef5c16b87556b9f1080793275b513 100644 (file)
@@ -164,695 +164,724 @@ typedef enum {
 } VkResult;
 
 // Structure type enumerant
-typedef enum VkStructureType_
-{
-    VK_STRUCTURE_TYPE_APPLICATION_INFO                      = 0,
-    VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO                    = 1,
-    VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO                     = 2,
-    VK_STRUCTURE_TYPE_MEMORY_OPEN_INFO                      = 3,
-    VK_STRUCTURE_TYPE_PEER_MEMORY_OPEN_INFO                 = 4,
-    VK_STRUCTURE_TYPE_BUFFER_VIEW_ATTACH_INFO               = 5,
-    VK_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO                = 6,
-    VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO                = 7,
-    VK_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO     = 8,
-    VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO        = 9,
-    VK_STRUCTURE_TYPE_SHADER_CREATE_INFO                    = 10,
-    VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO          = 11,
-    VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO                   = 12,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO     = 13,
-    VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO          = 14,
-    VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO          = 15,
-    VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO          = 16,
-    VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO          = 17,
-    VK_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO                = 18,
-    VK_STRUCTURE_TYPE_EVENT_CREATE_INFO                     = 19,
-    VK_STRUCTURE_TYPE_FENCE_CREATE_INFO                     = 20,
-    VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO                 = 21,
-    VK_STRUCTURE_TYPE_SEMAPHORE_OPEN_INFO                   = 22,
-    VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO                = 23,
-    VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO     = 24,
-    VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO         = 25,
-    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO     = 26,
-    VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO         = 27,
-    VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO       = 28,
-    VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO         = 29,
-    VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO         = 30,
-    VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO         = 31,
-    VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO         = 32,
-    VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO         = 33,
-    VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO                     = 34,
-    VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO                    = 35,
-    VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO               = 36,
-    VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO               = 37,
-    VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO                 = 38,
-    VK_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO        = 39,
-    VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO               = 40,
-    VK_STRUCTURE_TYPE_LAYER_CREATE_INFO                     = 41,
-    VK_STRUCTURE_TYPE_MEMORY_BARRIER                        = 42,
-    VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER                 = 43,
-    VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER                  = 44,
-    VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO           = 45,
-    VK_STRUCTURE_TYPE_UPDATE_SAMPLERS                       = 46,
-    VK_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES               = 47,
-    VK_STRUCTURE_TYPE_UPDATE_IMAGES                         = 48,
-    VK_STRUCTURE_TYPE_UPDATE_BUFFERS                        = 49,
-    VK_STRUCTURE_TYPE_UPDATE_AS_COPY                        = 50,
-    VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO                  = 51,
-    VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO           = 52,
+typedef enum {
+    VK_STRUCTURE_TYPE_APPLICATION_INFO = 0,
+    VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO = 1,
+    VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO = 2,
+    VK_STRUCTURE_TYPE_MEMORY_OPEN_INFO = 3,
+    VK_STRUCTURE_TYPE_PEER_MEMORY_OPEN_INFO = 4,
+    VK_STRUCTURE_TYPE_BUFFER_VIEW_ATTACH_INFO = 5,
+    VK_STRUCTURE_TYPE_IMAGE_VIEW_ATTACH_INFO = 6,
+    VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO = 7,
+    VK_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO = 8,
+    VK_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO = 9,
+    VK_STRUCTURE_TYPE_SHADER_CREATE_INFO = 10,
+    VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO = 11,
+    VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO = 12,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO = 13,
+    VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO = 14,
+    VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO = 15,
+    VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO = 16,
+    VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO = 17,
+    VK_STRUCTURE_TYPE_CMD_BUFFER_CREATE_INFO = 18,
+    VK_STRUCTURE_TYPE_EVENT_CREATE_INFO = 19,
+    VK_STRUCTURE_TYPE_FENCE_CREATE_INFO = 20,
+    VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO = 21,
+    VK_STRUCTURE_TYPE_SEMAPHORE_OPEN_INFO = 22,
+    VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO = 23,
+    VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 24,
+    VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 25,
+    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO = 26,
+    VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO = 27,
+    VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO = 28,
+    VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO = 29,
+    VK_STRUCTURE_TYPE_PIPELINE_RS_STATE_CREATE_INFO = 30,
+    VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO = 31,
+    VK_STRUCTURE_TYPE_PIPELINE_CB_STATE_CREATE_INFO = 32,
+    VK_STRUCTURE_TYPE_PIPELINE_DS_STATE_CREATE_INFO = 33,
+    VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO = 34,
+    VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO = 35,
+    VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO = 36,
+    VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO = 37,
+    VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO = 38,
+    VK_STRUCTURE_TYPE_CMD_BUFFER_GRAPHICS_BEGIN_INFO = 39,
+    VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO = 40,
+    VK_STRUCTURE_TYPE_LAYER_CREATE_INFO = 41,
+    VK_STRUCTURE_TYPE_MEMORY_BARRIER = 42,
+    VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER = 43,
+    VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER = 44,
+    VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO = 45,
+    VK_STRUCTURE_TYPE_UPDATE_SAMPLERS = 46,
+    VK_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES = 47,
+    VK_STRUCTURE_TYPE_UPDATE_IMAGES = 48,
+    VK_STRUCTURE_TYPE_UPDATE_BUFFERS = 49,
+    VK_STRUCTURE_TYPE_UPDATE_AS_COPY = 50,
+    VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO = 51,
+    VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO = 52,
 
     VK_ENUM_RANGE(STRUCTURE_TYPE, APPLICATION_INFO, PIPELINE_LAYOUT_CREATE_INFO)
 } VkStructureType;
 
-typedef enum VkSystemAllocType_
-{
-    VK_SYSTEM_ALLOC_TYPE_API_OBJECT                         = 0x00000000,
-    VK_SYSTEM_ALLOC_TYPE_INTERNAL                           = 0x00000001,
-    VK_SYSTEM_ALLOC_TYPE_INTERNAL_TEMP                      = 0x00000002,
-    VK_SYSTEM_ALLOC_TYPE_INTERNAL_SHADER                    = 0x00000003,
-    VK_SYSTEM_ALLOC_TYPE_DEBUG                              = 0x00000004,
-
-    VK_ENUM_RANGE(SYSTEM_ALLOC_TYPE, API_OBJECT, DEBUG)
+typedef enum {
+    VK_SYSTEM_ALLOC_TYPE_API_OBJECT = 0,
+    VK_SYSTEM_ALLOC_TYPE_INTERNAL = 1,
+    VK_SYSTEM_ALLOC_TYPE_INTERNAL_TEMP = 2,
+    VK_SYSTEM_ALLOC_TYPE_INTERNAL_SHADER = 3,
+    VK_SYSTEM_ALLOC_TYPE_DEBUG = 4,
+    VK_SYSTEM_ALLOC_TYPE_BEGIN_RANGE = VK_SYSTEM_ALLOC_TYPE_API_OBJECT,
+    VK_SYSTEM_ALLOC_TYPE_END_RANGE = VK_SYSTEM_ALLOC_TYPE_DEBUG,
+    VK_SYSTEM_ALLOC_TYPE_NUM = (VK_SYSTEM_ALLOC_TYPE_DEBUG - VK_SYSTEM_ALLOC_TYPE_API_OBJECT + 1),
+    VK_SYSTEM_ALLOC_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkSystemAllocType;
 
 // Vulkan format definitions
-typedef enum VkFormat_
-{
-    VK_FORMAT_UNDEFINED                                     = 0x00000000,
-    VK_FORMAT_R4G4_UNORM                                    = 0x00000001,
-    VK_FORMAT_R4G4_USCALED                                  = 0x00000002,
-    VK_FORMAT_R4G4B4A4_UNORM                                = 0x00000003,
-    VK_FORMAT_R4G4B4A4_USCALED                              = 0x00000004,
-    VK_FORMAT_R5G6B5_UNORM                                  = 0x00000005,
-    VK_FORMAT_R5G6B5_USCALED                                = 0x00000006,
-    VK_FORMAT_R5G5B5A1_UNORM                                = 0x00000007,
-    VK_FORMAT_R5G5B5A1_USCALED                              = 0x00000008,
-    VK_FORMAT_R8_UNORM                                      = 0x00000009,
-    VK_FORMAT_R8_SNORM                                      = 0x0000000A,
-    VK_FORMAT_R8_USCALED                                    = 0x0000000B,
-    VK_FORMAT_R8_SSCALED                                    = 0x0000000C,
-    VK_FORMAT_R8_UINT                                       = 0x0000000D,
-    VK_FORMAT_R8_SINT                                       = 0x0000000E,
-    VK_FORMAT_R8_SRGB                                       = 0x0000000F,
-    VK_FORMAT_R8G8_UNORM                                    = 0x00000010,
-    VK_FORMAT_R8G8_SNORM                                    = 0x00000011,
-    VK_FORMAT_R8G8_USCALED                                  = 0x00000012,
-    VK_FORMAT_R8G8_SSCALED                                  = 0x00000013,
-    VK_FORMAT_R8G8_UINT                                     = 0x00000014,
-    VK_FORMAT_R8G8_SINT                                     = 0x00000015,
-    VK_FORMAT_R8G8_SRGB                                     = 0x00000016,
-    VK_FORMAT_R8G8B8_UNORM                                  = 0x00000017,
-    VK_FORMAT_R8G8B8_SNORM                                  = 0x00000018,
-    VK_FORMAT_R8G8B8_USCALED                                = 0x00000019,
-    VK_FORMAT_R8G8B8_SSCALED                                = 0x0000001A,
-    VK_FORMAT_R8G8B8_UINT                                   = 0x0000001B,
-    VK_FORMAT_R8G8B8_SINT                                   = 0x0000001C,
-    VK_FORMAT_R8G8B8_SRGB                                   = 0x0000001D,
-    VK_FORMAT_R8G8B8A8_UNORM                                = 0x0000001E,
-    VK_FORMAT_R8G8B8A8_SNORM                                = 0x0000001F,
-    VK_FORMAT_R8G8B8A8_USCALED                              = 0x00000020,
-    VK_FORMAT_R8G8B8A8_SSCALED                              = 0x00000021,
-    VK_FORMAT_R8G8B8A8_UINT                                 = 0x00000022,
-    VK_FORMAT_R8G8B8A8_SINT                                 = 0x00000023,
-    VK_FORMAT_R8G8B8A8_SRGB                                 = 0x00000024,
-    VK_FORMAT_R10G10B10A2_UNORM                             = 0x00000025,
-    VK_FORMAT_R10G10B10A2_SNORM                             = 0x00000026,
-    VK_FORMAT_R10G10B10A2_USCALED                           = 0x00000027,
-    VK_FORMAT_R10G10B10A2_SSCALED                           = 0x00000028,
-    VK_FORMAT_R10G10B10A2_UINT                              = 0x00000029,
-    VK_FORMAT_R10G10B10A2_SINT                              = 0x0000002A,
-    VK_FORMAT_R16_UNORM                                     = 0x0000002B,
-    VK_FORMAT_R16_SNORM                                     = 0x0000002C,
-    VK_FORMAT_R16_USCALED                                   = 0x0000002D,
-    VK_FORMAT_R16_SSCALED                                   = 0x0000002E,
-    VK_FORMAT_R16_UINT                                      = 0x0000002F,
-    VK_FORMAT_R16_SINT                                      = 0x00000030,
-    VK_FORMAT_R16_SFLOAT                                    = 0x00000031,
-    VK_FORMAT_R16G16_UNORM                                  = 0x00000032,
-    VK_FORMAT_R16G16_SNORM                                  = 0x00000033,
-    VK_FORMAT_R16G16_USCALED                                = 0x00000034,
-    VK_FORMAT_R16G16_SSCALED                                = 0x00000035,
-    VK_FORMAT_R16G16_UINT                                   = 0x00000036,
-    VK_FORMAT_R16G16_SINT                                   = 0x00000037,
-    VK_FORMAT_R16G16_SFLOAT                                 = 0x00000038,
-    VK_FORMAT_R16G16B16_UNORM                               = 0x00000039,
-    VK_FORMAT_R16G16B16_SNORM                               = 0x0000003A,
-    VK_FORMAT_R16G16B16_USCALED                             = 0x0000003B,
-    VK_FORMAT_R16G16B16_SSCALED                             = 0x0000003C,
-    VK_FORMAT_R16G16B16_UINT                                = 0x0000003D,
-    VK_FORMAT_R16G16B16_SINT                                = 0x0000003E,
-    VK_FORMAT_R16G16B16_SFLOAT                              = 0x0000003F,
-    VK_FORMAT_R16G16B16A16_UNORM                            = 0x00000040,
-    VK_FORMAT_R16G16B16A16_SNORM                            = 0x00000041,
-    VK_FORMAT_R16G16B16A16_USCALED                          = 0x00000042,
-    VK_FORMAT_R16G16B16A16_SSCALED                          = 0x00000043,
-    VK_FORMAT_R16G16B16A16_UINT                             = 0x00000044,
-    VK_FORMAT_R16G16B16A16_SINT                             = 0x00000045,
-    VK_FORMAT_R16G16B16A16_SFLOAT                           = 0x00000046,
-    VK_FORMAT_R32_UINT                                      = 0x00000047,
-    VK_FORMAT_R32_SINT                                      = 0x00000048,
-    VK_FORMAT_R32_SFLOAT                                    = 0x00000049,
-    VK_FORMAT_R32G32_UINT                                   = 0x0000004A,
-    VK_FORMAT_R32G32_SINT                                   = 0x0000004B,
-    VK_FORMAT_R32G32_SFLOAT                                 = 0x0000004C,
-    VK_FORMAT_R32G32B32_UINT                                = 0x0000004D,
-    VK_FORMAT_R32G32B32_SINT                                = 0x0000004E,
-    VK_FORMAT_R32G32B32_SFLOAT                              = 0x0000004F,
-    VK_FORMAT_R32G32B32A32_UINT                             = 0x00000050,
-    VK_FORMAT_R32G32B32A32_SINT                             = 0x00000051,
-    VK_FORMAT_R32G32B32A32_SFLOAT                           = 0x00000052,
-    VK_FORMAT_R64_SFLOAT                                    = 0x00000053,
-    VK_FORMAT_R64G64_SFLOAT                                 = 0x00000054,
-    VK_FORMAT_R64G64B64_SFLOAT                              = 0x00000055,
-    VK_FORMAT_R64G64B64A64_SFLOAT                           = 0x00000056,
-    VK_FORMAT_R11G11B10_UFLOAT                              = 0x00000057,
-    VK_FORMAT_R9G9B9E5_UFLOAT                               = 0x00000058,
-    VK_FORMAT_D16_UNORM                                     = 0x00000059,
-    VK_FORMAT_D24_UNORM                                     = 0x0000005A,
-    VK_FORMAT_D32_SFLOAT                                    = 0x0000005B,
-    VK_FORMAT_S8_UINT                                       = 0x0000005C,
-    VK_FORMAT_D16_UNORM_S8_UINT                             = 0x0000005D,
-    VK_FORMAT_D24_UNORM_S8_UINT                             = 0x0000005E,
-    VK_FORMAT_D32_SFLOAT_S8_UINT                            = 0x0000005F,
-    VK_FORMAT_BC1_RGB_UNORM                                 = 0x00000060,
-    VK_FORMAT_BC1_RGB_SRGB                                  = 0x00000061,
-    VK_FORMAT_BC1_RGBA_UNORM                                = 0x00000062,
-    VK_FORMAT_BC1_RGBA_SRGB                                 = 0x00000063,
-    VK_FORMAT_BC2_UNORM                                     = 0x00000064,
-    VK_FORMAT_BC2_SRGB                                      = 0x00000065,
-    VK_FORMAT_BC3_UNORM                                     = 0x00000066,
-    VK_FORMAT_BC3_SRGB                                      = 0x00000067,
-    VK_FORMAT_BC4_UNORM                                     = 0x00000068,
-    VK_FORMAT_BC4_SNORM                                     = 0x00000069,
-    VK_FORMAT_BC5_UNORM                                     = 0x0000006A,
-    VK_FORMAT_BC5_SNORM                                     = 0x0000006B,
-    VK_FORMAT_BC6H_UFLOAT                                   = 0x0000006C,
-    VK_FORMAT_BC6H_SFLOAT                                   = 0x0000006D,
-    VK_FORMAT_BC7_UNORM                                     = 0x0000006E,
-    VK_FORMAT_BC7_SRGB                                      = 0x0000006F,
-    VK_FORMAT_ETC2_R8G8B8_UNORM                             = 0x00000070,
-    VK_FORMAT_ETC2_R8G8B8_SRGB                              = 0x00000071,
-    VK_FORMAT_ETC2_R8G8B8A1_UNORM                           = 0x00000072,
-    VK_FORMAT_ETC2_R8G8B8A1_SRGB                            = 0x00000073,
-    VK_FORMAT_ETC2_R8G8B8A8_UNORM                           = 0x00000074,
-    VK_FORMAT_ETC2_R8G8B8A8_SRGB                            = 0x00000075,
-    VK_FORMAT_EAC_R11_UNORM                                 = 0x00000076,
-    VK_FORMAT_EAC_R11_SNORM                                 = 0x00000077,
-    VK_FORMAT_EAC_R11G11_UNORM                              = 0x00000078,
-    VK_FORMAT_EAC_R11G11_SNORM                              = 0x00000079,
-    VK_FORMAT_ASTC_4x4_UNORM                                = 0x0000007A,
-    VK_FORMAT_ASTC_4x4_SRGB                                 = 0x0000007B,
-    VK_FORMAT_ASTC_5x4_UNORM                                = 0x0000007C,
-    VK_FORMAT_ASTC_5x4_SRGB                                 = 0x0000007D,
-    VK_FORMAT_ASTC_5x5_UNORM                                = 0x0000007E,
-    VK_FORMAT_ASTC_5x5_SRGB                                 = 0x0000007F,
-    VK_FORMAT_ASTC_6x5_UNORM                                = 0x00000080,
-    VK_FORMAT_ASTC_6x5_SRGB                                 = 0x00000081,
-    VK_FORMAT_ASTC_6x6_UNORM                                = 0x00000082,
-    VK_FORMAT_ASTC_6x6_SRGB                                 = 0x00000083,
-    VK_FORMAT_ASTC_8x5_UNORM                                = 0x00000084,
-    VK_FORMAT_ASTC_8x5_SRGB                                 = 0x00000085,
-    VK_FORMAT_ASTC_8x6_UNORM                                = 0x00000086,
-    VK_FORMAT_ASTC_8x6_SRGB                                 = 0x00000087,
-    VK_FORMAT_ASTC_8x8_UNORM                                = 0x00000088,
-    VK_FORMAT_ASTC_8x8_SRGB                                 = 0x00000089,
-    VK_FORMAT_ASTC_10x5_UNORM                               = 0x0000008A,
-    VK_FORMAT_ASTC_10x5_SRGB                                = 0x0000008B,
-    VK_FORMAT_ASTC_10x6_UNORM                               = 0x0000008C,
-    VK_FORMAT_ASTC_10x6_SRGB                                = 0x0000008D,
-    VK_FORMAT_ASTC_10x8_UNORM                               = 0x0000008E,
-    VK_FORMAT_ASTC_10x8_SRGB                                = 0x0000008F,
-    VK_FORMAT_ASTC_10x10_UNORM                              = 0x00000090,
-    VK_FORMAT_ASTC_10x10_SRGB                               = 0x00000091,
-    VK_FORMAT_ASTC_12x10_UNORM                              = 0x00000092,
-    VK_FORMAT_ASTC_12x10_SRGB                               = 0x00000093,
-    VK_FORMAT_ASTC_12x12_UNORM                              = 0x00000094,
-    VK_FORMAT_ASTC_12x12_SRGB                               = 0x00000095,
-    VK_FORMAT_B4G4R4A4_UNORM                                = 0x00000096,
-    VK_FORMAT_B5G5R5A1_UNORM                                = 0x00000097,
-    VK_FORMAT_B5G6R5_UNORM                                  = 0x00000098,
-    VK_FORMAT_B5G6R5_USCALED                                = 0x00000099,
-    VK_FORMAT_B8G8R8_UNORM                                  = 0x0000009A,
-    VK_FORMAT_B8G8R8_SNORM                                  = 0x0000009B,
-    VK_FORMAT_B8G8R8_USCALED                                = 0x0000009C,
-    VK_FORMAT_B8G8R8_SSCALED                                = 0x0000009D,
-    VK_FORMAT_B8G8R8_UINT                                   = 0x0000009E,
-    VK_FORMAT_B8G8R8_SINT                                   = 0x0000009F,
-    VK_FORMAT_B8G8R8_SRGB                                   = 0x000000A0,
-    VK_FORMAT_B8G8R8A8_UNORM                                = 0x000000A1,
-    VK_FORMAT_B8G8R8A8_SNORM                                = 0x000000A2,
-    VK_FORMAT_B8G8R8A8_USCALED                              = 0x000000A3,
-    VK_FORMAT_B8G8R8A8_SSCALED                              = 0x000000A4,
-    VK_FORMAT_B8G8R8A8_UINT                                 = 0x000000A5,
-    VK_FORMAT_B8G8R8A8_SINT                                 = 0x000000A6,
-    VK_FORMAT_B8G8R8A8_SRGB                                 = 0x000000A7,
-    VK_FORMAT_B10G10R10A2_UNORM                             = 0x000000A8,
-    VK_FORMAT_B10G10R10A2_SNORM                             = 0x000000A9,
-    VK_FORMAT_B10G10R10A2_USCALED                           = 0x000000AA,
-    VK_FORMAT_B10G10R10A2_SSCALED                           = 0x000000AB,
-    VK_FORMAT_B10G10R10A2_UINT                              = 0x000000AC,
-    VK_FORMAT_B10G10R10A2_SINT                              = 0x000000AD,
-
-    VK_ENUM_RANGE(FORMAT, UNDEFINED, B10G10R10A2_SINT)
+typedef enum {
+    VK_FORMAT_UNDEFINED = 0,
+    VK_FORMAT_R4G4_UNORM = 1,
+    VK_FORMAT_R4G4_USCALED = 2,
+    VK_FORMAT_R4G4B4A4_UNORM = 3,
+    VK_FORMAT_R4G4B4A4_USCALED = 4,
+    VK_FORMAT_R5G6B5_UNORM = 5,
+    VK_FORMAT_R5G6B5_USCALED = 6,
+    VK_FORMAT_R5G5B5A1_UNORM = 7,
+    VK_FORMAT_R5G5B5A1_USCALED = 8,
+    VK_FORMAT_R8_UNORM = 9,
+    VK_FORMAT_R8_SNORM = 10,
+    VK_FORMAT_R8_USCALED = 11,
+    VK_FORMAT_R8_SSCALED = 12,
+    VK_FORMAT_R8_UINT = 13,
+    VK_FORMAT_R8_SINT = 14,
+    VK_FORMAT_R8_SRGB = 15,
+    VK_FORMAT_R8G8_UNORM = 16,
+    VK_FORMAT_R8G8_SNORM = 17,
+    VK_FORMAT_R8G8_USCALED = 18,
+    VK_FORMAT_R8G8_SSCALED = 19,
+    VK_FORMAT_R8G8_UINT = 20,
+    VK_FORMAT_R8G8_SINT = 21,
+    VK_FORMAT_R8G8_SRGB = 22,
+    VK_FORMAT_R8G8B8_UNORM = 23,
+    VK_FORMAT_R8G8B8_SNORM = 24,
+    VK_FORMAT_R8G8B8_USCALED = 25,
+    VK_FORMAT_R8G8B8_SSCALED = 26,
+    VK_FORMAT_R8G8B8_UINT = 27,
+    VK_FORMAT_R8G8B8_SINT = 28,
+    VK_FORMAT_R8G8B8_SRGB = 29,
+    VK_FORMAT_R8G8B8A8_UNORM = 30,
+    VK_FORMAT_R8G8B8A8_SNORM = 31,
+    VK_FORMAT_R8G8B8A8_USCALED = 32,
+    VK_FORMAT_R8G8B8A8_SSCALED = 33,
+    VK_FORMAT_R8G8B8A8_UINT = 34,
+    VK_FORMAT_R8G8B8A8_SINT = 35,
+    VK_FORMAT_R8G8B8A8_SRGB = 36,
+    VK_FORMAT_R10G10B10A2_UNORM = 37,
+    VK_FORMAT_R10G10B10A2_SNORM = 38,
+    VK_FORMAT_R10G10B10A2_USCALED = 39,
+    VK_FORMAT_R10G10B10A2_SSCALED = 40,
+    VK_FORMAT_R10G10B10A2_UINT = 41,
+    VK_FORMAT_R10G10B10A2_SINT = 42,
+    VK_FORMAT_R16_UNORM = 43,
+    VK_FORMAT_R16_SNORM = 44,
+    VK_FORMAT_R16_USCALED = 45,
+    VK_FORMAT_R16_SSCALED = 46,
+    VK_FORMAT_R16_UINT = 47,
+    VK_FORMAT_R16_SINT = 48,
+    VK_FORMAT_R16_SFLOAT = 49,
+    VK_FORMAT_R16G16_UNORM = 50,
+    VK_FORMAT_R16G16_SNORM = 51,
+    VK_FORMAT_R16G16_USCALED = 52,
+    VK_FORMAT_R16G16_SSCALED = 53,
+    VK_FORMAT_R16G16_UINT = 54,
+    VK_FORMAT_R16G16_SINT = 55,
+    VK_FORMAT_R16G16_SFLOAT = 56,
+    VK_FORMAT_R16G16B16_UNORM = 57,
+    VK_FORMAT_R16G16B16_SNORM = 58,
+    VK_FORMAT_R16G16B16_USCALED = 59,
+    VK_FORMAT_R16G16B16_SSCALED = 60,
+    VK_FORMAT_R16G16B16_UINT = 61,
+    VK_FORMAT_R16G16B16_SINT = 62,
+    VK_FORMAT_R16G16B16_SFLOAT = 63,
+    VK_FORMAT_R16G16B16A16_UNORM = 64,
+    VK_FORMAT_R16G16B16A16_SNORM = 65,
+    VK_FORMAT_R16G16B16A16_USCALED = 66,
+    VK_FORMAT_R16G16B16A16_SSCALED = 67,
+    VK_FORMAT_R16G16B16A16_UINT = 68,
+    VK_FORMAT_R16G16B16A16_SINT = 69,
+    VK_FORMAT_R16G16B16A16_SFLOAT = 70,
+    VK_FORMAT_R32_UINT = 71,
+    VK_FORMAT_R32_SINT = 72,
+    VK_FORMAT_R32_SFLOAT = 73,
+    VK_FORMAT_R32G32_UINT = 74,
+    VK_FORMAT_R32G32_SINT = 75,
+    VK_FORMAT_R32G32_SFLOAT = 76,
+    VK_FORMAT_R32G32B32_UINT = 77,
+    VK_FORMAT_R32G32B32_SINT = 78,
+    VK_FORMAT_R32G32B32_SFLOAT = 79,
+    VK_FORMAT_R32G32B32A32_UINT = 80,
+    VK_FORMAT_R32G32B32A32_SINT = 81,
+    VK_FORMAT_R32G32B32A32_SFLOAT = 82,
+    VK_FORMAT_R64_SFLOAT = 83,
+    VK_FORMAT_R64G64_SFLOAT = 84,
+    VK_FORMAT_R64G64B64_SFLOAT = 85,
+    VK_FORMAT_R64G64B64A64_SFLOAT = 86,
+    VK_FORMAT_R11G11B10_UFLOAT = 87,
+    VK_FORMAT_R9G9B9E5_UFLOAT = 88,
+    VK_FORMAT_D16_UNORM = 89,
+    VK_FORMAT_D24_UNORM = 90,
+    VK_FORMAT_D32_SFLOAT = 91,
+    VK_FORMAT_S8_UINT = 92,
+    VK_FORMAT_D16_UNORM_S8_UINT = 93,
+    VK_FORMAT_D24_UNORM_S8_UINT = 94,
+    VK_FORMAT_D32_SFLOAT_S8_UINT = 95,
+    VK_FORMAT_BC1_RGB_UNORM = 96,
+    VK_FORMAT_BC1_RGB_SRGB = 97,
+    VK_FORMAT_BC1_RGBA_UNORM = 98,
+    VK_FORMAT_BC1_RGBA_SRGB = 99,
+    VK_FORMAT_BC2_UNORM = 100,
+    VK_FORMAT_BC2_SRGB = 101,
+    VK_FORMAT_BC3_UNORM = 102,
+    VK_FORMAT_BC3_SRGB = 103,
+    VK_FORMAT_BC4_UNORM = 104,
+    VK_FORMAT_BC4_SNORM = 105,
+    VK_FORMAT_BC5_UNORM = 106,
+    VK_FORMAT_BC5_SNORM = 107,
+    VK_FORMAT_BC6H_UFLOAT = 108,
+    VK_FORMAT_BC6H_SFLOAT = 109,
+    VK_FORMAT_BC7_UNORM = 110,
+    VK_FORMAT_BC7_SRGB = 111,
+    VK_FORMAT_ETC2_R8G8B8_UNORM = 112,
+    VK_FORMAT_ETC2_R8G8B8_SRGB = 113,
+    VK_FORMAT_ETC2_R8G8B8A1_UNORM = 114,
+    VK_FORMAT_ETC2_R8G8B8A1_SRGB = 115,
+    VK_FORMAT_ETC2_R8G8B8A8_UNORM = 116,
+    VK_FORMAT_ETC2_R8G8B8A8_SRGB = 117,
+    VK_FORMAT_EAC_R11_UNORM = 118,
+    VK_FORMAT_EAC_R11_SNORM = 119,
+    VK_FORMAT_EAC_R11G11_UNORM = 120,
+    VK_FORMAT_EAC_R11G11_SNORM = 121,
+    VK_FORMAT_ASTC_4x4_UNORM = 122,
+    VK_FORMAT_ASTC_4x4_SRGB = 123,
+    VK_FORMAT_ASTC_5x4_UNORM = 124,
+    VK_FORMAT_ASTC_5x4_SRGB = 125,
+    VK_FORMAT_ASTC_5x5_UNORM = 126,
+    VK_FORMAT_ASTC_5x5_SRGB = 127,
+    VK_FORMAT_ASTC_6x5_UNORM = 128,
+    VK_FORMAT_ASTC_6x5_SRGB = 129,
+    VK_FORMAT_ASTC_6x6_UNORM = 130,
+    VK_FORMAT_ASTC_6x6_SRGB = 131,
+    VK_FORMAT_ASTC_8x5_UNORM = 132,
+    VK_FORMAT_ASTC_8x5_SRGB = 133,
+    VK_FORMAT_ASTC_8x6_UNORM = 134,
+    VK_FORMAT_ASTC_8x6_SRGB = 135,
+    VK_FORMAT_ASTC_8x8_UNORM = 136,
+    VK_FORMAT_ASTC_8x8_SRGB = 137,
+    VK_FORMAT_ASTC_10x5_UNORM = 138,
+    VK_FORMAT_ASTC_10x5_SRGB = 139,
+    VK_FORMAT_ASTC_10x6_UNORM = 140,
+    VK_FORMAT_ASTC_10x6_SRGB = 141,
+    VK_FORMAT_ASTC_10x8_UNORM = 142,
+    VK_FORMAT_ASTC_10x8_SRGB = 143,
+    VK_FORMAT_ASTC_10x10_UNORM = 144,
+    VK_FORMAT_ASTC_10x10_SRGB = 145,
+    VK_FORMAT_ASTC_12x10_UNORM = 146,
+    VK_FORMAT_ASTC_12x10_SRGB = 147,
+    VK_FORMAT_ASTC_12x12_UNORM = 148,
+    VK_FORMAT_ASTC_12x12_SRGB = 149,
+    VK_FORMAT_B4G4R4A4_UNORM = 150,
+    VK_FORMAT_B5G5R5A1_UNORM = 151,
+    VK_FORMAT_B5G6R5_UNORM = 152,
+    VK_FORMAT_B5G6R5_USCALED = 153,
+    VK_FORMAT_B8G8R8_UNORM = 154,
+    VK_FORMAT_B8G8R8_SNORM = 155,
+    VK_FORMAT_B8G8R8_USCALED = 156,
+    VK_FORMAT_B8G8R8_SSCALED = 157,
+    VK_FORMAT_B8G8R8_UINT = 158,
+    VK_FORMAT_B8G8R8_SINT = 159,
+    VK_FORMAT_B8G8R8_SRGB = 160,
+    VK_FORMAT_B8G8R8A8_UNORM = 161,
+    VK_FORMAT_B8G8R8A8_SNORM = 162,
+    VK_FORMAT_B8G8R8A8_USCALED = 163,
+    VK_FORMAT_B8G8R8A8_SSCALED = 164,
+    VK_FORMAT_B8G8R8A8_UINT = 165,
+    VK_FORMAT_B8G8R8A8_SINT = 166,
+    VK_FORMAT_B8G8R8A8_SRGB = 167,
+    VK_FORMAT_B10G10R10A2_UNORM = 168,
+    VK_FORMAT_B10G10R10A2_SNORM = 169,
+    VK_FORMAT_B10G10R10A2_USCALED = 170,
+    VK_FORMAT_B10G10R10A2_SSCALED = 171,
+    VK_FORMAT_B10G10R10A2_UINT = 172,
+    VK_FORMAT_B10G10R10A2_SINT = 173,
+    VK_FORMAT_BEGIN_RANGE = VK_FORMAT_UNDEFINED,
+    VK_FORMAT_END_RANGE = VK_FORMAT_B10G10R10A2_SINT,
+    VK_FORMAT_NUM = (VK_FORMAT_B10G10R10A2_SINT - VK_FORMAT_UNDEFINED + 1),
+    VK_FORMAT_MAX_ENUM = 0x7FFFFFFF
 } VkFormat;
 
-typedef enum VkPhysicalDeviceType_
-{
-    VK_PHYSICAL_DEVICE_TYPE_OTHER                           = 0x00000000,
-    VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU                  = 0x00000001,
-    VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU                    = 0x00000002,
-    VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU                     = 0x00000003,
-    VK_PHYSICAL_DEVICE_TYPE_CPU                             = 0x00000004,
-
-    VK_ENUM_RANGE(PHYSICAL_DEVICE_TYPE, OTHER, CPU)
+typedef enum {
+    VK_PHYSICAL_DEVICE_TYPE_OTHER = 0,
+    VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU = 1,
+    VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU = 2,
+    VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU = 3,
+    VK_PHYSICAL_DEVICE_TYPE_CPU = 4,
+    VK_PHYSICAL_DEVICE_TYPE_BEGIN_RANGE = VK_PHYSICAL_DEVICE_TYPE_OTHER,
+    VK_PHYSICAL_DEVICE_TYPE_END_RANGE = VK_PHYSICAL_DEVICE_TYPE_CPU,
+    VK_PHYSICAL_DEVICE_TYPE_NUM = (VK_PHYSICAL_DEVICE_TYPE_CPU - VK_PHYSICAL_DEVICE_TYPE_OTHER + 1),
+    VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkPhysicalDeviceType;
 
-// Object type enumerant
-typedef enum VkObjectType_
-{
-    VK_OBJECT_TYPE_INSTANCE                                 = 0,
-    VK_OBJECT_TYPE_PHYSICAL_DEVICE                          = 1,
-    VK_OBJECT_TYPE_DEVICE                                   = 2,
-    VK_OBJECT_TYPE_QUEUE                                    = 3,
-    VK_OBJECT_TYPE_COMMAND_BUFFER                           = 4,
-    VK_OBJECT_TYPE_DEVICE_MEMORY                            = 5,
-    VK_OBJECT_TYPE_BUFFER                                   = 6,
-    VK_OBJECT_TYPE_BUFFER_VIEW                              = 7,
-    VK_OBJECT_TYPE_IMAGE                                    = 8,
-    VK_OBJECT_TYPE_IMAGE_VIEW                               = 9,
-    VK_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW                    = 10,
-    VK_OBJECT_TYPE_DEPTH_STENCIL_VIEW                       = 11,
-    VK_OBJECT_TYPE_SHADER                                   = 12,
-    VK_OBJECT_TYPE_PIPELINE                                 = 13,
-    VK_OBJECT_TYPE_PIPELINE_LAYOUT                          = 14,
-    VK_OBJECT_TYPE_SAMPLER                                  = 15,
-    VK_OBJECT_TYPE_DESCRIPTOR_SET                           = 16,
-    VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT                    = 17,
-    VK_OBJECT_TYPE_DESCRIPTOR_POOL                          = 18,
-    VK_OBJECT_TYPE_DYNAMIC_VP_STATE                         = 19,
-    VK_OBJECT_TYPE_DYNAMIC_RS_STATE                         = 20,
-    VK_OBJECT_TYPE_DYNAMIC_CB_STATE                         = 21,
-    VK_OBJECT_TYPE_DYNAMIC_DS_STATE                         = 22,
-    VK_OBJECT_TYPE_FENCE                                    = 23,
-    VK_OBJECT_TYPE_SEMAPHORE                                = 24,
-    VK_OBJECT_TYPE_EVENT                                    = 25,
-    VK_OBJECT_TYPE_QUERY_POOL                               = 26,
-    VK_OBJECT_TYPE_FRAMEBUFFER                              = 27,
-    VK_OBJECT_TYPE_RENDER_PASS                              = 28,
+typedef enum {
+    VK_OBJECT_TYPE_INSTANCE = 0,
+    VK_OBJECT_TYPE_PHYSICAL_DEVICE = 1,
+    VK_OBJECT_TYPE_DEVICE = 2,
+    VK_OBJECT_TYPE_QUEUE = 3,
+    VK_OBJECT_TYPE_COMMAND_BUFFER = 4,
+    VK_OBJECT_TYPE_DEVICE_MEMORY = 5,
+    VK_OBJECT_TYPE_BUFFER = 6,
+    VK_OBJECT_TYPE_BUFFER_VIEW = 7,
+    VK_OBJECT_TYPE_IMAGE = 8,
+    VK_OBJECT_TYPE_IMAGE_VIEW = 9,
+    VK_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW = 10,
+    VK_OBJECT_TYPE_DEPTH_STENCIL_VIEW = 11,
+    VK_OBJECT_TYPE_SHADER = 12,
+    VK_OBJECT_TYPE_PIPELINE = 13,
+    VK_OBJECT_TYPE_PIPELINE_LAYOUT = 14,
+    VK_OBJECT_TYPE_SAMPLER = 15,
+    VK_OBJECT_TYPE_DESCRIPTOR_SET = 16,
+    VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 17,
+    VK_OBJECT_TYPE_DESCRIPTOR_POOL = 18,
+    VK_OBJECT_TYPE_DYNAMIC_VP_STATE = 19,
+    VK_OBJECT_TYPE_DYNAMIC_RS_STATE = 20,
+    VK_OBJECT_TYPE_DYNAMIC_CB_STATE = 21,
+    VK_OBJECT_TYPE_DYNAMIC_DS_STATE = 22,
+    VK_OBJECT_TYPE_FENCE = 23,
+    VK_OBJECT_TYPE_SEMAPHORE = 24,
+    VK_OBJECT_TYPE_EVENT = 25,
+    VK_OBJECT_TYPE_QUERY_POOL = 26,
+    VK_OBJECT_TYPE_FRAMEBUFFER = 27,
+    VK_OBJECT_TYPE_RENDER_PASS = 28,
 
     // Valid ranges for core Vulkan:
-    VK_OBJECT_TYPE_BEGIN_RANGE                              = VK_OBJECT_TYPE_INSTANCE,
-    VK_OBJECT_TYPE_END_RANGE                                = VK_OBJECT_TYPE_RENDER_PASS,
-    VK_NUM_OBJECT_TYPE                                      = (VK_OBJECT_TYPE_END_RANGE - VK_OBJECT_TYPE_BEGIN_RANGE + 1),
-    VK_MAX_ENUM(VkObjectType)
+    VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_INSTANCE,
+    VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_RENDER_PASS,
+    VK_NUM_OBJECT_TYPE = (VK_OBJECT_TYPE_END_RANGE - VK_OBJECT_TYPE_BEGIN_RANGE + 1),
+    VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkObjectType;
 
-typedef enum VkImageAspect_
-{
-    VK_IMAGE_ASPECT_COLOR                                   = 0x00000000,
-    VK_IMAGE_ASPECT_DEPTH                                   = 0x00000001,
-    VK_IMAGE_ASPECT_STENCIL                                 = 0x00000002,
-
-    VK_ENUM_RANGE(IMAGE_ASPECT, COLOR, STENCIL)
+typedef enum {
+    VK_IMAGE_ASPECT_COLOR = 0,
+    VK_IMAGE_ASPECT_DEPTH = 1,
+    VK_IMAGE_ASPECT_STENCIL = 2,
+    VK_IMAGE_ASPECT_BEGIN_RANGE = VK_IMAGE_ASPECT_COLOR,
+    VK_IMAGE_ASPECT_END_RANGE = VK_IMAGE_ASPECT_STENCIL,
+    VK_IMAGE_ASPECT_NUM = (VK_IMAGE_ASPECT_STENCIL - VK_IMAGE_ASPECT_COLOR + 1),
+    VK_IMAGE_ASPECT_MAX_ENUM = 0x7FFFFFFF
 } VkImageAspect;
 
-typedef enum VkQueryType_
-{
-    VK_QUERY_TYPE_OCCLUSION                                 = 0x00000000,
-    VK_QUERY_TYPE_PIPELINE_STATISTICS                       = 0x00000001, // Optional
-
-    VK_ENUM_RANGE(QUERY_TYPE, OCCLUSION, PIPELINE_STATISTICS)
+typedef enum {
+    VK_QUERY_TYPE_OCCLUSION = 0,
+    VK_QUERY_TYPE_PIPELINE_STATISTICS = 1,
+    VK_QUERY_TYPE_BEGIN_RANGE = VK_QUERY_TYPE_OCCLUSION,
+    VK_QUERY_TYPE_END_RANGE = VK_QUERY_TYPE_PIPELINE_STATISTICS,
+    VK_QUERY_TYPE_NUM = (VK_QUERY_TYPE_PIPELINE_STATISTICS - VK_QUERY_TYPE_OCCLUSION + 1),
+    VK_QUERY_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkQueryType;
 
-typedef enum VkBufferViewType_
-{
-    VK_BUFFER_VIEW_TYPE_RAW                                 = 0x00000000,   // Raw buffer without special structure (UBO, SSBO)
-    VK_BUFFER_VIEW_TYPE_FORMATTED                           = 0x00000001,   // Buffer with format (TBO, IBO)
-
-    VK_ENUM_RANGE(BUFFER_VIEW_TYPE, RAW, FORMATTED)
+typedef enum {
+    VK_BUFFER_VIEW_TYPE_RAW = 0,
+    VK_BUFFER_VIEW_TYPE_FORMATTED = 1,
+    VK_BUFFER_VIEW_TYPE_BEGIN_RANGE = VK_BUFFER_VIEW_TYPE_RAW,
+    VK_BUFFER_VIEW_TYPE_END_RANGE = VK_BUFFER_VIEW_TYPE_FORMATTED,
+    VK_BUFFER_VIEW_TYPE_NUM = (VK_BUFFER_VIEW_TYPE_FORMATTED - VK_BUFFER_VIEW_TYPE_RAW + 1),
+    VK_BUFFER_VIEW_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkBufferViewType;
 
-typedef enum VkImageType_
-{
-    VK_IMAGE_TYPE_1D                                        = 0x00000000,
-    VK_IMAGE_TYPE_2D                                        = 0x00000001,
-    VK_IMAGE_TYPE_3D                                        = 0x00000002,
-
-    VK_ENUM_RANGE(IMAGE_TYPE, 1D, 3D)
+typedef enum {
+    VK_IMAGE_TYPE_1D = 0,
+    VK_IMAGE_TYPE_2D = 1,
+    VK_IMAGE_TYPE_3D = 2,
+    VK_IMAGE_TYPE_BEGIN_RANGE = VK_IMAGE_TYPE_1D,
+    VK_IMAGE_TYPE_END_RANGE = VK_IMAGE_TYPE_3D,
+    VK_IMAGE_TYPE_NUM = (VK_IMAGE_TYPE_3D - VK_IMAGE_TYPE_1D + 1),
+    VK_IMAGE_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkImageType;
 
-typedef enum VkImageTiling_
-{
-    VK_IMAGE_TILING_LINEAR                                  = 0x00000000,
-    VK_IMAGE_TILING_OPTIMAL                                 = 0x00000001,
-
-    VK_ENUM_RANGE(IMAGE_TILING, LINEAR, OPTIMAL)
+typedef enum {
+    VK_IMAGE_TILING_LINEAR = 0,
+    VK_IMAGE_TILING_OPTIMAL = 1,
+    VK_IMAGE_TILING_BEGIN_RANGE = VK_IMAGE_TILING_LINEAR,
+    VK_IMAGE_TILING_END_RANGE = VK_IMAGE_TILING_OPTIMAL,
+    VK_IMAGE_TILING_NUM = (VK_IMAGE_TILING_OPTIMAL - VK_IMAGE_TILING_LINEAR + 1),
+    VK_IMAGE_TILING_MAX_ENUM = 0x7FFFFFFF
 } VkImageTiling;
 
-typedef enum VkImageViewType_
-{
-    VK_IMAGE_VIEW_TYPE_1D                                   = 0x00000000,
-    VK_IMAGE_VIEW_TYPE_2D                                   = 0x00000001,
-    VK_IMAGE_VIEW_TYPE_3D                                   = 0x00000002,
-    VK_IMAGE_VIEW_TYPE_CUBE                                 = 0x00000003,
-
-    VK_ENUM_RANGE(IMAGE_VIEW_TYPE, 1D, CUBE)
+typedef enum {
+    VK_IMAGE_VIEW_TYPE_1D = 0,
+    VK_IMAGE_VIEW_TYPE_2D = 1,
+    VK_IMAGE_VIEW_TYPE_3D = 2,
+    VK_IMAGE_VIEW_TYPE_CUBE = 3,
+    VK_IMAGE_VIEW_TYPE_BEGIN_RANGE = VK_IMAGE_VIEW_TYPE_1D,
+    VK_IMAGE_VIEW_TYPE_END_RANGE = VK_IMAGE_VIEW_TYPE_CUBE,
+    VK_IMAGE_VIEW_TYPE_NUM = (VK_IMAGE_VIEW_TYPE_CUBE - VK_IMAGE_VIEW_TYPE_1D + 1),
+    VK_IMAGE_VIEW_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkImageViewType;
 
-typedef enum VkChannelSwizzle_
-{
-    VK_CHANNEL_SWIZZLE_ZERO                                 = 0x00000000,
-    VK_CHANNEL_SWIZZLE_ONE                                  = 0x00000001,
-    VK_CHANNEL_SWIZZLE_R                                    = 0x00000002,
-    VK_CHANNEL_SWIZZLE_G                                    = 0x00000003,
-    VK_CHANNEL_SWIZZLE_B                                    = 0x00000004,
-    VK_CHANNEL_SWIZZLE_A                                    = 0x00000005,
-
-    VK_ENUM_RANGE(CHANNEL_SWIZZLE, ZERO, A)
+typedef enum {
+    VK_CHANNEL_SWIZZLE_ZERO = 0,
+    VK_CHANNEL_SWIZZLE_ONE = 1,
+    VK_CHANNEL_SWIZZLE_R = 2,
+    VK_CHANNEL_SWIZZLE_G = 3,
+    VK_CHANNEL_SWIZZLE_B = 4,
+    VK_CHANNEL_SWIZZLE_A = 5,
+    VK_CHANNEL_SWIZZLE_BEGIN_RANGE = VK_CHANNEL_SWIZZLE_ZERO,
+    VK_CHANNEL_SWIZZLE_END_RANGE = VK_CHANNEL_SWIZZLE_A,
+    VK_CHANNEL_SWIZZLE_NUM = (VK_CHANNEL_SWIZZLE_A - VK_CHANNEL_SWIZZLE_ZERO + 1),
+    VK_CHANNEL_SWIZZLE_MAX_ENUM = 0x7FFFFFFF
 } VkChannelSwizzle;
 
-// Shader stage enumerant
-typedef enum VkShaderStage_
-{
-    VK_SHADER_STAGE_VERTEX                                  = 0,
-    VK_SHADER_STAGE_TESS_CONTROL                            = 1,
-    VK_SHADER_STAGE_TESS_EVALUATION                         = 2,
-    VK_SHADER_STAGE_GEOMETRY                                = 3,
-    VK_SHADER_STAGE_FRAGMENT                                = 4,
-    VK_SHADER_STAGE_COMPUTE                                 = 5,
+typedef enum {
+    VK_SHADER_STAGE_VERTEX = 0,
+    VK_SHADER_STAGE_TESS_CONTROL = 1,
+    VK_SHADER_STAGE_TESS_EVALUATION = 2,
+    VK_SHADER_STAGE_GEOMETRY = 3,
+    VK_SHADER_STAGE_FRAGMENT = 4,
+    VK_SHADER_STAGE_COMPUTE = 5,
 
     VK_ENUM_RANGE(SHADER_STAGE, VERTEX, COMPUTE)
 } VkShaderStage;
 
-typedef enum VkVertexInputStepRate_
-{
-    VK_VERTEX_INPUT_STEP_RATE_VERTEX                        = 0x0,
-    VK_VERTEX_INPUT_STEP_RATE_INSTANCE                      = 0x1,
-    VK_VERTEX_INPUT_STEP_RATE_DRAW                          = 0x2,  //Optional
-
-    VK_ENUM_RANGE(VERTEX_INPUT_STEP_RATE, VERTEX, DRAW)
+typedef enum {
+    VK_VERTEX_INPUT_STEP_RATE_VERTEX = 0,
+    VK_VERTEX_INPUT_STEP_RATE_INSTANCE = 1,
+    VK_VERTEX_INPUT_STEP_RATE_DRAW = 2,
+    VK_VERTEX_INPUT_STEP_RATE_BEGIN_RANGE = VK_VERTEX_INPUT_STEP_RATE_VERTEX,
+    VK_VERTEX_INPUT_STEP_RATE_END_RANGE = VK_VERTEX_INPUT_STEP_RATE_DRAW,
+    VK_VERTEX_INPUT_STEP_RATE_NUM = (VK_VERTEX_INPUT_STEP_RATE_DRAW - VK_VERTEX_INPUT_STEP_RATE_VERTEX + 1),
+    VK_VERTEX_INPUT_STEP_RATE_MAX_ENUM = 0x7FFFFFFF
 } VkVertexInputStepRate;
 
-typedef enum VkPrimitiveTopology_
-{
-    VK_PRIMITIVE_TOPOLOGY_POINT_LIST                        = 0x00000000,
-    VK_PRIMITIVE_TOPOLOGY_LINE_LIST                         = 0x00000001,
-    VK_PRIMITIVE_TOPOLOGY_LINE_STRIP                        = 0x00000002,
-    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST                     = 0x00000003,
-    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP                    = 0x00000004,
-    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN                      = 0x00000005,
-    VK_PRIMITIVE_TOPOLOGY_LINE_LIST_ADJ                     = 0x00000006,
-    VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_ADJ                    = 0x00000007,
-    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_ADJ                 = 0x00000008,
-    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_ADJ                = 0x00000009,
-    VK_PRIMITIVE_TOPOLOGY_PATCH                             = 0x0000000a,
-
-    VK_ENUM_RANGE(PRIMITIVE_TOPOLOGY, POINT_LIST, PATCH)
+typedef enum {
+    VK_PRIMITIVE_TOPOLOGY_POINT_LIST = 0,
+    VK_PRIMITIVE_TOPOLOGY_LINE_LIST = 1,
+    VK_PRIMITIVE_TOPOLOGY_LINE_STRIP = 2,
+    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST = 3,
+    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP = 4,
+    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN = 5,
+    VK_PRIMITIVE_TOPOLOGY_LINE_LIST_ADJ = 6,
+    VK_PRIMITIVE_TOPOLOGY_LINE_STRIP_ADJ = 7,
+    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST_ADJ = 8,
+    VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_ADJ = 9,
+    VK_PRIMITIVE_TOPOLOGY_PATCH = 10,
+    VK_PRIMITIVE_TOPOLOGY_BEGIN_RANGE = VK_PRIMITIVE_TOPOLOGY_POINT_LIST,
+    VK_PRIMITIVE_TOPOLOGY_END_RANGE = VK_PRIMITIVE_TOPOLOGY_PATCH,
+    VK_PRIMITIVE_TOPOLOGY_NUM = (VK_PRIMITIVE_TOPOLOGY_PATCH - VK_PRIMITIVE_TOPOLOGY_POINT_LIST + 1),
+    VK_PRIMITIVE_TOPOLOGY_MAX_ENUM = 0x7FFFFFFF
 } VkPrimitiveTopology;
 
-typedef enum VkFillMode_
-{
-    VK_FILL_MODE_POINTS                                     = 0x00000000,
-    VK_FILL_MODE_WIREFRAME                                  = 0x00000001,
-    VK_FILL_MODE_SOLID                                      = 0x00000002,
-
-    VK_ENUM_RANGE(FILL_MODE, POINTS, SOLID)
+typedef enum {
+    VK_FILL_MODE_POINTS = 0,
+    VK_FILL_MODE_WIREFRAME = 1,
+    VK_FILL_MODE_SOLID = 2,
+    VK_FILL_MODE_BEGIN_RANGE = VK_FILL_MODE_POINTS,
+    VK_FILL_MODE_END_RANGE = VK_FILL_MODE_SOLID,
+    VK_FILL_MODE_NUM = (VK_FILL_MODE_SOLID - VK_FILL_MODE_POINTS + 1),
+    VK_FILL_MODE_MAX_ENUM = 0x7FFFFFFF
 } VkFillMode;
 
-typedef enum VkCullMode_
-{
-    VK_CULL_MODE_NONE                                       = 0x00000000,
-    VK_CULL_MODE_FRONT                                      = 0x00000001,
-    VK_CULL_MODE_BACK                                       = 0x00000002,
-    VK_CULL_MODE_FRONT_AND_BACK                             = 0x00000003,
-
-    VK_ENUM_RANGE(CULL_MODE, NONE, FRONT_AND_BACK)
+typedef enum {
+    VK_CULL_MODE_NONE = 0,
+    VK_CULL_MODE_FRONT = 1,
+    VK_CULL_MODE_BACK = 2,
+    VK_CULL_MODE_FRONT_AND_BACK = 3,
+    VK_CULL_MODE_BEGIN_RANGE = VK_CULL_MODE_NONE,
+    VK_CULL_MODE_END_RANGE = VK_CULL_MODE_FRONT_AND_BACK,
+    VK_CULL_MODE_NUM = (VK_CULL_MODE_FRONT_AND_BACK - VK_CULL_MODE_NONE + 1),
+    VK_CULL_MODE_MAX_ENUM = 0x7FFFFFFF
 } VkCullMode;
 
-typedef enum VkFrontFace_
-{
-    VK_FRONT_FACE_CCW                                       = 0x00000000,
-    VK_FRONT_FACE_CW                                        = 0x00000001,
-
-    VK_ENUM_RANGE(FRONT_FACE, CCW, CW)
+typedef enum {
+    VK_FRONT_FACE_CCW = 0,
+    VK_FRONT_FACE_CW = 1,
+    VK_FRONT_FACE_BEGIN_RANGE = VK_FRONT_FACE_CCW,
+    VK_FRONT_FACE_END_RANGE = VK_FRONT_FACE_CW,
+    VK_FRONT_FACE_NUM = (VK_FRONT_FACE_CW - VK_FRONT_FACE_CCW + 1),
+    VK_FRONT_FACE_MAX_ENUM = 0x7FFFFFFF
 } VkFrontFace;
 
-typedef enum VkCompareOp_
-{
-    VK_COMPARE_OP_NEVER                                     = 0x00000000,
-    VK_COMPARE_OP_LESS                                      = 0x00000001,
-    VK_COMPARE_OP_EQUAL                                     = 0x00000002,
-    VK_COMPARE_OP_LESS_EQUAL                                = 0x00000003,
-    VK_COMPARE_OP_GREATER                                   = 0x00000004,
-    VK_COMPARE_OP_NOT_EQUAL                                 = 0x00000005,
-    VK_COMPARE_OP_GREATER_EQUAL                             = 0x00000006,
-    VK_COMPARE_OP_ALWAYS                                    = 0x00000007,
-
-    VK_ENUM_RANGE(COMPARE_OP, NEVER, ALWAYS)
+typedef enum {
+    VK_COMPARE_OP_NEVER = 0,
+    VK_COMPARE_OP_LESS = 1,
+    VK_COMPARE_OP_EQUAL = 2,
+    VK_COMPARE_OP_LESS_EQUAL = 3,
+    VK_COMPARE_OP_GREATER = 4,
+    VK_COMPARE_OP_NOT_EQUAL = 5,
+    VK_COMPARE_OP_GREATER_EQUAL = 6,
+    VK_COMPARE_OP_ALWAYS = 7,
+    VK_COMPARE_OP_BEGIN_RANGE = VK_COMPARE_OP_NEVER,
+    VK_COMPARE_OP_END_RANGE = VK_COMPARE_OP_ALWAYS,
+    VK_COMPARE_OP_NUM = (VK_COMPARE_OP_ALWAYS - VK_COMPARE_OP_NEVER + 1),
+    VK_COMPARE_OP_MAX_ENUM = 0x7FFFFFFF
 } VkCompareOp;
 
-typedef enum VkStencilOp_
-{
-    VK_STENCIL_OP_KEEP                                      = 0x00000000,
-    VK_STENCIL_OP_ZERO                                      = 0x00000001,
-    VK_STENCIL_OP_REPLACE                                   = 0x00000002,
-    VK_STENCIL_OP_INC_CLAMP                                 = 0x00000003,
-    VK_STENCIL_OP_DEC_CLAMP                                 = 0x00000004,
-    VK_STENCIL_OP_INVERT                                    = 0x00000005,
-    VK_STENCIL_OP_INC_WRAP                                  = 0x00000006,
-    VK_STENCIL_OP_DEC_WRAP                                  = 0x00000007,
-
-    VK_ENUM_RANGE(STENCIL_OP, KEEP, DEC_WRAP)
+typedef enum {
+    VK_STENCIL_OP_KEEP = 0,
+    VK_STENCIL_OP_ZERO = 1,
+    VK_STENCIL_OP_REPLACE = 2,
+    VK_STENCIL_OP_INC_CLAMP = 3,
+    VK_STENCIL_OP_DEC_CLAMP = 4,
+    VK_STENCIL_OP_INVERT = 5,
+    VK_STENCIL_OP_INC_WRAP = 6,
+    VK_STENCIL_OP_DEC_WRAP = 7,
+    VK_STENCIL_OP_BEGIN_RANGE = VK_STENCIL_OP_KEEP,
+    VK_STENCIL_OP_END_RANGE = VK_STENCIL_OP_DEC_WRAP,
+    VK_STENCIL_OP_NUM = (VK_STENCIL_OP_DEC_WRAP - VK_STENCIL_OP_KEEP + 1),
+    VK_STENCIL_OP_MAX_ENUM = 0x7FFFFFFF
 } VkStencilOp;
 
-typedef enum VkLogicOp_
-{
-    VK_LOGIC_OP_COPY                                        = 0x00000000,
-    VK_LOGIC_OP_CLEAR                                       = 0x00000001,
-    VK_LOGIC_OP_AND                                         = 0x00000002,
-    VK_LOGIC_OP_AND_REVERSE                                 = 0x00000003,
-    VK_LOGIC_OP_AND_INVERTED                                = 0x00000004,
-    VK_LOGIC_OP_NOOP                                        = 0x00000005,
-    VK_LOGIC_OP_XOR                                         = 0x00000006,
-    VK_LOGIC_OP_OR                                          = 0x00000007,
-    VK_LOGIC_OP_NOR                                         = 0x00000008,
-    VK_LOGIC_OP_EQUIV                                       = 0x00000009,
-    VK_LOGIC_OP_INVERT                                      = 0x0000000a,
-    VK_LOGIC_OP_OR_REVERSE                                  = 0x0000000b,
-    VK_LOGIC_OP_COPY_INVERTED                               = 0x0000000c,
-    VK_LOGIC_OP_OR_INVERTED                                 = 0x0000000d,
-    VK_LOGIC_OP_NAND                                        = 0x0000000e,
-    VK_LOGIC_OP_SET                                         = 0x0000000f,
-
-    VK_ENUM_RANGE(LOGIC_OP, COPY, SET)
+typedef enum {
+    VK_LOGIC_OP_COPY = 0,
+    VK_LOGIC_OP_CLEAR = 1,
+    VK_LOGIC_OP_AND = 2,
+    VK_LOGIC_OP_AND_REVERSE = 3,
+    VK_LOGIC_OP_AND_INVERTED = 4,
+    VK_LOGIC_OP_NOOP = 5,
+    VK_LOGIC_OP_XOR = 6,
+    VK_LOGIC_OP_OR = 7,
+    VK_LOGIC_OP_NOR = 8,
+    VK_LOGIC_OP_EQUIV = 9,
+    VK_LOGIC_OP_INVERT = 10,
+    VK_LOGIC_OP_OR_REVERSE = 11,
+    VK_LOGIC_OP_COPY_INVERTED = 12,
+    VK_LOGIC_OP_OR_INVERTED = 13,
+    VK_LOGIC_OP_NAND = 14,
+    VK_LOGIC_OP_SET = 15,
+    VK_LOGIC_OP_BEGIN_RANGE = VK_LOGIC_OP_COPY,
+    VK_LOGIC_OP_END_RANGE = VK_LOGIC_OP_SET,
+    VK_LOGIC_OP_NUM = (VK_LOGIC_OP_SET - VK_LOGIC_OP_COPY + 1),
+    VK_LOGIC_OP_MAX_ENUM = 0x7FFFFFFF
 } VkLogicOp;
 
-typedef enum VkBlend_
-{
-    VK_BLEND_ZERO                                           = 0x00000000,
-    VK_BLEND_ONE                                            = 0x00000001,
-    VK_BLEND_SRC_COLOR                                      = 0x00000002,
-    VK_BLEND_ONE_MINUS_SRC_COLOR                            = 0x00000003,
-    VK_BLEND_DEST_COLOR                                     = 0x00000004,
-    VK_BLEND_ONE_MINUS_DEST_COLOR                           = 0x00000005,
-    VK_BLEND_SRC_ALPHA                                      = 0x00000006,
-    VK_BLEND_ONE_MINUS_SRC_ALPHA                            = 0x00000007,
-    VK_BLEND_DEST_ALPHA                                     = 0x00000008,
-    VK_BLEND_ONE_MINUS_DEST_ALPHA                           = 0x00000009,
-    VK_BLEND_CONSTANT_COLOR                                 = 0x0000000a,
-    VK_BLEND_ONE_MINUS_CONSTANT_COLOR                       = 0x0000000b,
-    VK_BLEND_CONSTANT_ALPHA                                 = 0x0000000c,
-    VK_BLEND_ONE_MINUS_CONSTANT_ALPHA                       = 0x0000000d,
-    VK_BLEND_SRC_ALPHA_SATURATE                             = 0x0000000e,
-    VK_BLEND_SRC1_COLOR                                     = 0x0000000f,
-    VK_BLEND_ONE_MINUS_SRC1_COLOR                           = 0x00000010,
-    VK_BLEND_SRC1_ALPHA                                     = 0x00000011,
-    VK_BLEND_ONE_MINUS_SRC1_ALPHA                           = 0x00000012,
-
-    VK_ENUM_RANGE(BLEND, ZERO, ONE_MINUS_SRC1_ALPHA)
+typedef enum {
+    VK_BLEND_ZERO = 0,
+    VK_BLEND_ONE = 1,
+    VK_BLEND_SRC_COLOR = 2,
+    VK_BLEND_ONE_MINUS_SRC_COLOR = 3,
+    VK_BLEND_DEST_COLOR = 4,
+    VK_BLEND_ONE_MINUS_DEST_COLOR = 5,
+    VK_BLEND_SRC_ALPHA = 6,
+    VK_BLEND_ONE_MINUS_SRC_ALPHA = 7,
+    VK_BLEND_DEST_ALPHA = 8,
+    VK_BLEND_ONE_MINUS_DEST_ALPHA = 9,
+    VK_BLEND_CONSTANT_COLOR = 10,
+    VK_BLEND_ONE_MINUS_CONSTANT_COLOR = 11,
+    VK_BLEND_CONSTANT_ALPHA = 12,
+    VK_BLEND_ONE_MINUS_CONSTANT_ALPHA = 13,
+    VK_BLEND_SRC_ALPHA_SATURATE = 14,
+    VK_BLEND_SRC1_COLOR = 15,
+    VK_BLEND_ONE_MINUS_SRC1_COLOR = 16,
+    VK_BLEND_SRC1_ALPHA = 17,
+    VK_BLEND_ONE_MINUS_SRC1_ALPHA = 18,
+    VK_BLEND_BEGIN_RANGE = VK_BLEND_ZERO,
+    VK_BLEND_END_RANGE = VK_BLEND_ONE_MINUS_SRC1_ALPHA,
+    VK_BLEND_NUM = (VK_BLEND_ONE_MINUS_SRC1_ALPHA - VK_BLEND_ZERO + 1),
+    VK_BLEND_MAX_ENUM = 0x7FFFFFFF
 } VkBlend;
 
-typedef enum VkBlendOp_
-{
-    VK_BLEND_OP_ADD                                         = 0x00000000,
-    VK_BLEND_OP_SUBTRACT                                    = 0x00000001,
-    VK_BLEND_OP_REVERSE_SUBTRACT                            = 0x00000002,
-    VK_BLEND_OP_MIN                                         = 0x00000003,
-    VK_BLEND_OP_MAX                                         = 0x00000004,
-
-    VK_ENUM_RANGE(BLEND_OP, ADD, MAX)
+typedef enum {
+    VK_BLEND_OP_ADD = 0,
+    VK_BLEND_OP_SUBTRACT = 1,
+    VK_BLEND_OP_REVERSE_SUBTRACT = 2,
+    VK_BLEND_OP_MIN = 3,
+    VK_BLEND_OP_MAX = 4,
+    VK_BLEND_OP_BEGIN_RANGE = VK_BLEND_OP_ADD,
+    VK_BLEND_OP_END_RANGE = VK_BLEND_OP_MAX,
+    VK_BLEND_OP_NUM = (VK_BLEND_OP_MAX - VK_BLEND_OP_ADD + 1),
+    VK_BLEND_OP_MAX_ENUM = 0x7FFFFFFF
 } VkBlendOp;
 
-typedef enum VkTexFilter_
-{
-    VK_TEX_FILTER_NEAREST                                   = 0x00000000,
-    VK_TEX_FILTER_LINEAR                                    = 0x00000001,
-
-    VK_ENUM_RANGE(TEX_FILTER, NEAREST, LINEAR)
+typedef enum {
+    VK_TEX_FILTER_NEAREST = 0,
+    VK_TEX_FILTER_LINEAR = 1,
+    VK_TEX_FILTER_BEGIN_RANGE = VK_TEX_FILTER_NEAREST,
+    VK_TEX_FILTER_END_RANGE = VK_TEX_FILTER_LINEAR,
+    VK_TEX_FILTER_NUM = (VK_TEX_FILTER_LINEAR - VK_TEX_FILTER_NEAREST + 1),
+    VK_TEX_FILTER_MAX_ENUM = 0x7FFFFFFF
 } VkTexFilter;
 
-typedef enum VkTexMipmapMode_
-{
-    VK_TEX_MIPMAP_MODE_BASE                                 = 0x00000000,   // Always choose base level
-    VK_TEX_MIPMAP_MODE_NEAREST                              = 0x00000001,   // Choose nearest mip level
-    VK_TEX_MIPMAP_MODE_LINEAR                               = 0x00000002,   // Linear filter between mip levels
-
-    VK_ENUM_RANGE(TEX_MIPMAP_MODE, BASE, LINEAR)
+typedef enum {
+    VK_TEX_MIPMAP_MODE_BASE = 0,
+    VK_TEX_MIPMAP_MODE_NEAREST = 1,
+    VK_TEX_MIPMAP_MODE_LINEAR = 2,
+    VK_TEX_MIPMAP_MODE_BEGIN_RANGE = VK_TEX_MIPMAP_MODE_BASE,
+    VK_TEX_MIPMAP_MODE_END_RANGE = VK_TEX_MIPMAP_MODE_LINEAR,
+    VK_TEX_MIPMAP_MODE_NUM = (VK_TEX_MIPMAP_MODE_LINEAR - VK_TEX_MIPMAP_MODE_BASE + 1),
+    VK_TEX_MIPMAP_MODE_MAX_ENUM = 0x7FFFFFFF
 } VkTexMipmapMode;
 
-typedef enum VkTexAddress_
-{
-    VK_TEX_ADDRESS_WRAP                                     = 0x00000000,
-    VK_TEX_ADDRESS_MIRROR                                   = 0x00000001,
-    VK_TEX_ADDRESS_CLAMP                                    = 0x00000002,
-    VK_TEX_ADDRESS_MIRROR_ONCE                              = 0x00000003,
-    VK_TEX_ADDRESS_CLAMP_BORDER                             = 0x00000004,
-
-    VK_ENUM_RANGE(TEX_ADDRESS, WRAP, CLAMP_BORDER)
+typedef enum {
+    VK_TEX_ADDRESS_WRAP = 0,
+    VK_TEX_ADDRESS_MIRROR = 1,
+    VK_TEX_ADDRESS_CLAMP = 2,
+    VK_TEX_ADDRESS_MIRROR_ONCE = 3,
+    VK_TEX_ADDRESS_CLAMP_BORDER = 4,
+    VK_TEX_ADDRESS_BEGIN_RANGE = VK_TEX_ADDRESS_WRAP,
+    VK_TEX_ADDRESS_END_RANGE = VK_TEX_ADDRESS_CLAMP_BORDER,
+    VK_TEX_ADDRESS_NUM = (VK_TEX_ADDRESS_CLAMP_BORDER - VK_TEX_ADDRESS_WRAP + 1),
+    VK_TEX_ADDRESS_MAX_ENUM = 0x7FFFFFFF
 } VkTexAddress;
 
-typedef enum VkBorderColor_
-{
-    VK_BORDER_COLOR_OPAQUE_WHITE                            = 0x00000000,
-    VK_BORDER_COLOR_TRANSPARENT_BLACK                       = 0x00000001,
-    VK_BORDER_COLOR_OPAQUE_BLACK                            = 0x00000002,
-
-    VK_ENUM_RANGE(BORDER_COLOR, OPAQUE_WHITE, OPAQUE_BLACK)
+typedef enum {
+    VK_BORDER_COLOR_OPAQUE_WHITE = 0,
+    VK_BORDER_COLOR_TRANSPARENT_BLACK = 1,
+    VK_BORDER_COLOR_OPAQUE_BLACK = 2,
+    VK_BORDER_COLOR_BEGIN_RANGE = VK_BORDER_COLOR_OPAQUE_WHITE,
+    VK_BORDER_COLOR_END_RANGE = VK_BORDER_COLOR_OPAQUE_BLACK,
+    VK_BORDER_COLOR_NUM = (VK_BORDER_COLOR_OPAQUE_BLACK - VK_BORDER_COLOR_OPAQUE_WHITE + 1),
+    VK_BORDER_COLOR_MAX_ENUM = 0x7FFFFFFF
 } VkBorderColor;
 
-typedef enum VkDescriptorType_
-{
-    VK_DESCRIPTOR_TYPE_SAMPLER                              = 0x00000000,
-    VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER               = 0x00000001,
-    VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE                        = 0x00000002,
-    VK_DESCRIPTOR_TYPE_STORAGE_IMAGE                        = 0x00000003,
-    VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER                 = 0x00000004,
-    VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER                 = 0x00000005,
-    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER                       = 0x00000006,
-    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER                       = 0x00000007,
-    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC               = 0x00000008,
-    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC               = 0x00000009,
-
-    VK_ENUM_RANGE(DESCRIPTOR_TYPE, SAMPLER, STORAGE_BUFFER_DYNAMIC)
+typedef enum {
+    VK_DESCRIPTOR_TYPE_SAMPLER = 0,
+    VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER = 1,
+    VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE = 2,
+    VK_DESCRIPTOR_TYPE_STORAGE_IMAGE = 3,
+    VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER = 4,
+    VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER = 5,
+    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER = 6,
+    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER = 7,
+    VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8,
+    VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9,
+    VK_DESCRIPTOR_TYPE_BEGIN_RANGE = VK_DESCRIPTOR_TYPE_SAMPLER,
+    VK_DESCRIPTOR_TYPE_END_RANGE = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC,
+    VK_DESCRIPTOR_TYPE_NUM = (VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC - VK_DESCRIPTOR_TYPE_SAMPLER + 1),
+    VK_DESCRIPTOR_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkDescriptorType;
 
-typedef enum VkDescriptorPoolUsage_
-{
-    VK_DESCRIPTOR_POOL_USAGE_ONE_SHOT                       = 0x00000000,
-    VK_DESCRIPTOR_POOL_USAGE_DYNAMIC                        = 0x00000001,
-
-    VK_ENUM_RANGE(DESCRIPTOR_POOL_USAGE, ONE_SHOT, DYNAMIC)
+typedef enum {
+    VK_DESCRIPTOR_POOL_USAGE_ONE_SHOT = 0,
+    VK_DESCRIPTOR_POOL_USAGE_DYNAMIC = 1,
+    VK_DESCRIPTOR_POOL_USAGE_BEGIN_RANGE = VK_DESCRIPTOR_POOL_USAGE_ONE_SHOT,
+    VK_DESCRIPTOR_POOL_USAGE_END_RANGE = VK_DESCRIPTOR_POOL_USAGE_DYNAMIC,
+    VK_DESCRIPTOR_POOL_USAGE_NUM = (VK_DESCRIPTOR_POOL_USAGE_DYNAMIC - VK_DESCRIPTOR_POOL_USAGE_ONE_SHOT + 1),
+    VK_DESCRIPTOR_POOL_USAGE_MAX_ENUM = 0x7FFFFFFF
 } VkDescriptorPoolUsage;
 
-typedef enum VkDescriptorUpdateMode_
-{
-    VK_DESCRIPTOR_UPDATE_MODE_COPY                          = 0x00000000,
-    VK_DESCRIPTOR_UPDATE_MODE_FASTEST                       = 0x00000001,
+typedef enum {
+    VK_DESCRIPTOR_UPDATE_MODE_COPY = 0,
+    VK_DESCRIPTOR_UPDATE_MODE_FASTEST = 1,
 
     VK_ENUM_RANGE(DESCRIPTOR_UPDATE_MODE, COPY, FASTEST)
 } VkDescriptorUpdateMode;
 
-typedef enum VkDescriptorSetUsage_
-{
-    VK_DESCRIPTOR_SET_USAGE_ONE_SHOT                        = 0x00000000,
-    VK_DESCRIPTOR_SET_USAGE_STATIC                          = 0x00000001,
-
-    VK_ENUM_RANGE(DESCRIPTOR_SET_USAGE, ONE_SHOT, STATIC)
+typedef enum {
+    VK_DESCRIPTOR_SET_USAGE_ONE_SHOT = 0,
+    VK_DESCRIPTOR_SET_USAGE_STATIC = 1,
+    VK_DESCRIPTOR_SET_USAGE_BEGIN_RANGE = VK_DESCRIPTOR_SET_USAGE_ONE_SHOT,
+    VK_DESCRIPTOR_SET_USAGE_END_RANGE = VK_DESCRIPTOR_SET_USAGE_STATIC,
+    VK_DESCRIPTOR_SET_USAGE_NUM = (VK_DESCRIPTOR_SET_USAGE_STATIC - VK_DESCRIPTOR_SET_USAGE_ONE_SHOT + 1),
+    VK_DESCRIPTOR_SET_USAGE_MAX_ENUM = 0x7FFFFFFF
 } VkDescriptorSetUsage;
 
-typedef enum VkImageLayout_
-{
-    VK_IMAGE_LAYOUT_UNDEFINED                               = 0x00000000,   // Implicit layout an image is when its contents are undefined due to various reasons (e.g. right after creation)
-    VK_IMAGE_LAYOUT_GENERAL                                 = 0x00000001,   // General layout when image can be used for any kind of access
-    VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL                = 0x00000002,   // Optimal layout when image is only used for color attachment read/write
-    VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL        = 0x00000003,   // Optimal layout when image is only used for depth/stencil attachment read/write
-    VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL         = 0x00000004,   // Optimal layout when image is used for read only depth/stencil attachment and shader access
-    VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL                = 0x00000005,   // Optimal layout when image is used for read only shader access
-    VK_IMAGE_LAYOUT_CLEAR_OPTIMAL                           = 0x00000006,   // Optimal layout when image is used only for clear operations
-    VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL                 = 0x00000007,   // Optimal layout when image is used only as source of transfer operations
-    VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL            = 0x00000008,   // Optimal layout when image is used only as destination of transfer operations
-
-    VK_ENUM_RANGE(IMAGE_LAYOUT, UNDEFINED, TRANSFER_DESTINATION_OPTIMAL)
+typedef enum {
+    VK_IMAGE_LAYOUT_UNDEFINED = 0,
+    VK_IMAGE_LAYOUT_GENERAL = 1,
+    VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL = 2,
+    VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL = 3,
+    VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL = 4,
+    VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL = 5,
+    VK_IMAGE_LAYOUT_CLEAR_OPTIMAL = 6,
+    VK_IMAGE_LAYOUT_TRANSFER_SOURCE_OPTIMAL = 7,
+    VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL = 8,
+    VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED,
+    VK_IMAGE_LAYOUT_END_RANGE = VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
+    VK_IMAGE_LAYOUT_NUM = (VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL - VK_IMAGE_LAYOUT_UNDEFINED + 1),
+    VK_IMAGE_LAYOUT_MAX_ENUM = 0x7FFFFFFF
 } VkImageLayout;
 
-typedef enum VkAttachmentLoadOp_
-{
-    VK_ATTACHMENT_LOAD_OP_LOAD                              = 0x00000000,
-    VK_ATTACHMENT_LOAD_OP_CLEAR                             = 0x00000001,
-    VK_ATTACHMENT_LOAD_OP_DONT_CARE                         = 0x00000002,
-
-    VK_ENUM_RANGE(ATTACHMENT_LOAD_OP, LOAD, DONT_CARE)
+typedef enum {
+    VK_ATTACHMENT_LOAD_OP_LOAD = 0,
+    VK_ATTACHMENT_LOAD_OP_CLEAR = 1,
+    VK_ATTACHMENT_LOAD_OP_DONT_CARE = 2,
+    VK_ATTACHMENT_LOAD_OP_BEGIN_RANGE = VK_ATTACHMENT_LOAD_OP_LOAD,
+    VK_ATTACHMENT_LOAD_OP_END_RANGE = VK_ATTACHMENT_LOAD_OP_DONT_CARE,
+    VK_ATTACHMENT_LOAD_OP_NUM = (VK_ATTACHMENT_LOAD_OP_DONT_CARE - VK_ATTACHMENT_LOAD_OP_LOAD + 1),
+    VK_ATTACHMENT_LOAD_OP_MAX_ENUM = 0x7FFFFFFF
 } VkAttachmentLoadOp;
 
-typedef enum VkAttachmentStoreOp_
-{
-    VK_ATTACHMENT_STORE_OP_STORE                            = 0x00000000,
-    VK_ATTACHMENT_STORE_OP_RESOLVE_MSAA                     = 0x00000001,
-    VK_ATTACHMENT_STORE_OP_DONT_CARE                        = 0x00000002,
-
-    VK_ENUM_RANGE(ATTACHMENT_STORE_OP, STORE, DONT_CARE)
+typedef enum {
+    VK_ATTACHMENT_STORE_OP_STORE = 0,
+    VK_ATTACHMENT_STORE_OP_RESOLVE_MSAA = 1,
+    VK_ATTACHMENT_STORE_OP_DONT_CARE = 2,
+    VK_ATTACHMENT_STORE_OP_BEGIN_RANGE = VK_ATTACHMENT_STORE_OP_STORE,
+    VK_ATTACHMENT_STORE_OP_END_RANGE = VK_ATTACHMENT_STORE_OP_DONT_CARE,
+    VK_ATTACHMENT_STORE_OP_NUM = (VK_ATTACHMENT_STORE_OP_DONT_CARE - VK_ATTACHMENT_STORE_OP_STORE + 1),
+    VK_ATTACHMENT_STORE_OP_MAX_ENUM = 0x7FFFFFFF
 } VkAttachmentStoreOp;
 
-typedef enum VkPipelineBindPoint_
-{
-    VK_PIPELINE_BIND_POINT_COMPUTE                          = 0x00000000,
-    VK_PIPELINE_BIND_POINT_GRAPHICS                         = 0x00000001,
-
-    VK_ENUM_RANGE(PIPELINE_BIND_POINT, COMPUTE, GRAPHICS)
+typedef enum {
+    VK_PIPELINE_BIND_POINT_COMPUTE = 0,
+    VK_PIPELINE_BIND_POINT_GRAPHICS = 1,
+    VK_PIPELINE_BIND_POINT_BEGIN_RANGE = VK_PIPELINE_BIND_POINT_COMPUTE,
+    VK_PIPELINE_BIND_POINT_END_RANGE = VK_PIPELINE_BIND_POINT_GRAPHICS,
+    VK_PIPELINE_BIND_POINT_NUM = (VK_PIPELINE_BIND_POINT_GRAPHICS - VK_PIPELINE_BIND_POINT_COMPUTE + 1),
+    VK_PIPELINE_BIND_POINT_MAX_ENUM = 0x7FFFFFFF
 } VkPipelineBindPoint;
 
-typedef enum VkStateBindPoint_
-{
-    VK_STATE_BIND_POINT_VIEWPORT                            = 0x00000000,
-    VK_STATE_BIND_POINT_RASTER                              = 0x00000001,
-    VK_STATE_BIND_POINT_COLOR_BLEND                         = 0x00000002,
-    VK_STATE_BIND_POINT_DEPTH_STENCIL                       = 0x00000003,
-
-    VK_ENUM_RANGE(STATE_BIND_POINT, VIEWPORT, DEPTH_STENCIL)
+typedef enum {
+    VK_STATE_BIND_POINT_VIEWPORT = 0,
+    VK_STATE_BIND_POINT_RASTER = 1,
+    VK_STATE_BIND_POINT_COLOR_BLEND = 2,
+    VK_STATE_BIND_POINT_DEPTH_STENCIL = 3,
+    VK_STATE_BIND_POINT_BEGIN_RANGE = VK_STATE_BIND_POINT_VIEWPORT,
+    VK_STATE_BIND_POINT_END_RANGE = VK_STATE_BIND_POINT_DEPTH_STENCIL,
+    VK_STATE_BIND_POINT_NUM = (VK_STATE_BIND_POINT_DEPTH_STENCIL - VK_STATE_BIND_POINT_VIEWPORT + 1),
+    VK_STATE_BIND_POINT_MAX_ENUM = 0x7FFFFFFF
 } VkStateBindPoint;
 
-typedef enum VkIndexType_
-{
-    VK_INDEX_TYPE_UINT8                                     = 0x00000000,
-    VK_INDEX_TYPE_UINT16                                    = 0x00000001,
-    VK_INDEX_TYPE_UINT32                                    = 0x00000002,
-
-    VK_ENUM_RANGE(INDEX_TYPE, UINT8, UINT32)
+typedef enum {
+    VK_INDEX_TYPE_UINT8 = 0,
+    VK_INDEX_TYPE_UINT16 = 1,
+    VK_INDEX_TYPE_UINT32 = 2,
+    VK_INDEX_TYPE_BEGIN_RANGE = VK_INDEX_TYPE_UINT8,
+    VK_INDEX_TYPE_END_RANGE = VK_INDEX_TYPE_UINT32,
+    VK_INDEX_TYPE_NUM = (VK_INDEX_TYPE_UINT32 - VK_INDEX_TYPE_UINT8 + 1),
+    VK_INDEX_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkIndexType;
 
-typedef enum VkPipeEvent_
-{
-    VK_PIPE_EVENT_TOP_OF_PIPE                               = 0x00000001,   // Set event before the device starts processing subsequent command
-    VK_PIPE_EVENT_VERTEX_PROCESSING_COMPLETE                = 0x00000002,   // Set event when all pending vertex processing is complete
-    VK_PIPE_EVENT_LOCAL_FRAGMENT_PROCESSING_COMPLETE        = 0x00000003,   // Set event when all pending fragment shader executions are complete, within each fragment location
-    VK_PIPE_EVENT_FRAGMENT_PROCESSING_COMPLETE              = 0x00000004,   // Set event when all pending fragment shader executions are complete
-    VK_PIPE_EVENT_GRAPHICS_PIPELINE_COMPLETE                = 0x00000005,   // Set event when all pending graphics operations are complete
-    VK_PIPE_EVENT_COMPUTE_PIPELINE_COMPLETE                 = 0x00000006,   // Set event when all pending compute operations are complete
-    VK_PIPE_EVENT_TRANSFER_COMPLETE                         = 0x00000007,   // Set event when all pending transfer operations are complete
-    VK_PIPE_EVENT_COMMANDS_COMPLETE                         = 0x00000008,   // Set event when all pending work is complete
-
-    VK_ENUM_RANGE(PIPE_EVENT, TOP_OF_PIPE, COMMANDS_COMPLETE)
+typedef enum {
+    VK_PIPE_EVENT_TOP_OF_PIPE = 1,
+    VK_PIPE_EVENT_VERTEX_PROCESSING_COMPLETE = 2,
+    VK_PIPE_EVENT_LOCAL_FRAGMENT_PROCESSING_COMPLETE = 3,
+    VK_PIPE_EVENT_FRAGMENT_PROCESSING_COMPLETE = 4,
+    VK_PIPE_EVENT_GRAPHICS_PIPELINE_COMPLETE = 5,
+    VK_PIPE_EVENT_COMPUTE_PIPELINE_COMPLETE = 6,
+    VK_PIPE_EVENT_TRANSFER_COMPLETE = 7,
+    VK_PIPE_EVENT_COMMANDS_COMPLETE = 8,
+    VK_PIPE_EVENT_BEGIN_RANGE = VK_PIPE_EVENT_TOP_OF_PIPE,
+    VK_PIPE_EVENT_END_RANGE = VK_PIPE_EVENT_COMMANDS_COMPLETE,
+    VK_PIPE_EVENT_NUM = (VK_PIPE_EVENT_COMMANDS_COMPLETE - VK_PIPE_EVENT_TOP_OF_PIPE + 1),
+    VK_PIPE_EVENT_MAX_ENUM = 0x7FFFFFFF
 } VkPipeEvent;
 
-typedef enum VkWaitEvent_
-{
-    VK_WAIT_EVENT_TOP_OF_PIPE                               = 0x00000001,   // Wait event before the device starts processing subsequent commands
-    VK_WAIT_EVENT_BEFORE_RASTERIZATION                      = 0x00000002,   // Wait event before rasterizing subsequent primitives
-
-    VK_ENUM_RANGE(WAIT_EVENT, TOP_OF_PIPE, BEFORE_RASTERIZATION)
+typedef enum {
+    VK_WAIT_EVENT_TOP_OF_PIPE = 1,
+    VK_WAIT_EVENT_BEFORE_RASTERIZATION = 2,
+    VK_WAIT_EVENT_BEGIN_RANGE = VK_WAIT_EVENT_TOP_OF_PIPE,
+    VK_WAIT_EVENT_END_RANGE = VK_WAIT_EVENT_BEFORE_RASTERIZATION,
+    VK_WAIT_EVENT_NUM = (VK_WAIT_EVENT_BEFORE_RASTERIZATION - VK_WAIT_EVENT_TOP_OF_PIPE + 1),
+    VK_WAIT_EVENT_MAX_ENUM = 0x7FFFFFFF
 } VkWaitEvent;
 
-typedef enum VkTimestampType_
-{
-    VK_TIMESTAMP_TYPE_TOP                                   = 0x00000000,
-    VK_TIMESTAMP_TYPE_BOTTOM                                = 0x00000001,
-
-    VK_ENUM_RANGE(TIMESTAMP_TYPE, TOP, BOTTOM)
+typedef enum {
+    VK_TIMESTAMP_TYPE_TOP = 0,
+    VK_TIMESTAMP_TYPE_BOTTOM = 1,
+    VK_TIMESTAMP_TYPE_BEGIN_RANGE = VK_TIMESTAMP_TYPE_TOP,
+    VK_TIMESTAMP_TYPE_END_RANGE = VK_TIMESTAMP_TYPE_BOTTOM,
+    VK_TIMESTAMP_TYPE_NUM = (VK_TIMESTAMP_TYPE_BOTTOM - VK_TIMESTAMP_TYPE_TOP + 1),
+    VK_TIMESTAMP_TYPE_MAX_ENUM = 0x7FFFFFFF
 } VkTimestampType;
 
 // Format capability flags
 typedef VkFlags VkFormatFeatureFlags;
-typedef enum VkFormatFeatureFlagBits_
-{
+typedef enum {
     VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT                     = VK_BIT(0),    // Format can be used for sampled images (SAMPLED_IMAGE and COMBINED_IMAGE_SAMPLER descriptor types)
     VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT                     = VK_BIT(1),    // Format can be used for storage images (STORAGE_IMAGE descriptor type)
     VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT              = VK_BIT(2),    // Format supports atomic operations in case it's used for storage images
@@ -868,8 +897,7 @@ typedef enum VkFormatFeatureFlagBits_
 
 // Queue capabilities
 typedef VkFlags VkQueueFlags;
-typedef enum VkQueueFlagBits_
-{
+typedef enum {
     VK_QUEUE_GRAPHICS_BIT                                   = VK_BIT(0),    // Queue supports graphics operations
     VK_QUEUE_COMPUTE_BIT                                    = VK_BIT(1),    // Queue supports compute operations
     VK_QUEUE_DMA_BIT                                        = VK_BIT(2),    // Queue supports DMA operations
@@ -879,8 +907,7 @@ typedef enum VkQueueFlagBits_
 
 // Memory properties passed into vkAllocMemory().
 typedef VkFlags VkMemoryPropertyFlags;
-typedef enum VkMemoryPropertyFlagBits_
-{
+typedef enum {
     VK_MEMORY_PROPERTY_DEVICE_ONLY                          = 0,            // If otherwise stated, then allocate memory on device
     VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT                     = VK_BIT(0),    // Memory should be mappable by host
     VK_MEMORY_PROPERTY_HOST_DEVICE_COHERENT_BIT             = VK_BIT(1),    // Memory should be coherent between host and device accesses
@@ -892,8 +919,7 @@ typedef enum VkMemoryPropertyFlagBits_
 
 // Device creation flags
 typedef VkFlags VkDeviceCreateFlags;
-typedef enum VkDeviceCreateFlagBits_
-{
+typedef enum {
     VK_DEVICE_CREATE_VALIDATION_BIT                         = VK_BIT(0),
     VK_DEVICE_CREATE_MULTI_DEVICE_IQ_MATCH_BIT              = VK_BIT(1),
 } VkDeviceCreateFlagBits;
@@ -903,15 +929,13 @@ typedef VkFlags VkMemoryMapFlags;
 
 // Fence creation flags
 typedef VkFlags VkFenceCreateFlags;
-typedef enum VkFenceCreateFlagBits_
-{
+typedef enum {
     VK_FENCE_CREATE_SIGNALED_BIT                            = VK_BIT(0),
 } VkFenceCreateFlagBits;
 
 // Semaphore creation flags
 typedef VkFlags VkSemaphoreCreateFlags;
-typedef enum VkSemaphoreCreateFlagBits_
-{
+typedef enum {
     VK_SEMAPHORE_CREATE_SHAREABLE_BIT                       = VK_BIT(0),
 } VkSemaphoreCreateFlagBits;
 
@@ -936,8 +960,7 @@ typedef enum VkQueryPipelineStatisticFlagBits_ {
 
 // Query result flags
 typedef VkFlags VkQueryResultFlags;
-typedef enum VkQueryResultFlagBits_
-{
+typedef enum {
     VK_QUERY_RESULT_32_BIT                                  = 0,           // Results of the queries are written to the destination buffer as 32-bit values
     VK_QUERY_RESULT_64_BIT                                  = VK_BIT(0),   // Results of the queries are written to the destination buffer as 64-bit values
     VK_QUERY_RESULT_NO_WAIT_BIT                             = 0,           // Results of the queries aren't waited on before proceeding with the result copy
@@ -948,8 +971,7 @@ typedef enum VkQueryResultFlagBits_
 
 // Buffer usage flags
 typedef VkFlags VkBufferUsageFlags;
-typedef enum VkBufferUsageFlagBits_
-{
+typedef enum {
     VK_BUFFER_USAGE_GENERAL                                 = 0,            // No special usage
     VK_BUFFER_USAGE_TRANSFER_SOURCE_BIT                     = VK_BIT(0),    // Can be used as a source of transfer operations
     VK_BUFFER_USAGE_TRANSFER_DESTINATION_BIT                = VK_BIT(1),    // Can be used as a destination of transfer operations
@@ -964,16 +986,14 @@ typedef enum VkBufferUsageFlagBits_
 
 // Buffer creation flags
 typedef VkFlags VkBufferCreateFlags;
-typedef enum VkBufferCreateFlagBits_
-{
+typedef enum {
     VK_BUFFER_CREATE_SHAREABLE_BIT                          = VK_BIT(0),    // Buffer should be shareable
     VK_BUFFER_CREATE_SPARSE_BIT                             = VK_BIT(1),    // Buffer should support sparse backing
 } VkBufferCreateFlagBits;
 
 // Image usage flags
 typedef VkFlags VkImageUsageFlags;
-typedef enum VkImageUsageFlagBits_
-{
+typedef enum {
     VK_IMAGE_USAGE_GENERAL                                  = 0,            // No special usage
     VK_IMAGE_USAGE_TRANSFER_SOURCE_BIT                      = VK_BIT(0),    // Can be used as a source of transfer operations
     VK_IMAGE_USAGE_TRANSFER_DESTINATION_BIT                 = VK_BIT(1),    // Can be used as a destination of transfer operations
@@ -986,8 +1006,7 @@ typedef enum VkImageUsageFlagBits_
 
 // Image creation flags
 typedef VkFlags VkImageCreateFlags;
-typedef enum VkImageCreateFlagBits_
-{
+typedef enum {
     VK_IMAGE_CREATE_INVARIANT_DATA_BIT                      = VK_BIT(0),
     VK_IMAGE_CREATE_CLONEABLE_BIT                           = VK_BIT(1),
     VK_IMAGE_CREATE_SHAREABLE_BIT                           = VK_BIT(2),    // Image should be shareable
@@ -998,8 +1017,7 @@ typedef enum VkImageCreateFlagBits_
 
 // Depth-stencil view creation flags
 typedef VkFlags VkDepthStencilViewCreateFlags;
-typedef enum VkDepthStencilViewCreateFlagBits_
-{
+typedef enum {
     VK_DEPTH_STENCIL_VIEW_CREATE_READ_ONLY_DEPTH_BIT        = VK_BIT(0),
     VK_DEPTH_STENCIL_VIEW_CREATE_READ_ONLY_STENCIL_BIT      = VK_BIT(1),
 } VkDepthStencilViewCreateFlagBits;
@@ -1009,8 +1027,7 @@ typedef VkFlags VkShaderCreateFlags;
 
 // Channel flags
 typedef VkFlags VkChannelFlags;
-typedef enum VkChannelFlagBits_
-{
+typedef enum {
     VK_CHANNEL_R_BIT                                        = VK_BIT(0),
     VK_CHANNEL_G_BIT                                        = VK_BIT(1),
     VK_CHANNEL_B_BIT                                        = VK_BIT(2),
@@ -1019,16 +1036,14 @@ typedef enum VkChannelFlagBits_
 
 // Pipeline creation flags
 typedef VkFlags VkPipelineCreateFlags;
-typedef enum VkPipelineCreateFlagBits_
-{
+typedef enum {
     VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT             = VK_BIT(0),
     VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT                = VK_BIT(1),
 } VkPipelineCreateFlagBits;
 
 // Shader stage flags
 typedef VkFlags VkShaderStageFlags;
-typedef enum VkShaderStageFlagBits_
-{
+typedef enum {
     VK_SHADER_STAGE_VERTEX_BIT                              = VK_BIT(0),
     VK_SHADER_STAGE_TESS_CONTROL_BIT                        = VK_BIT(1),
     VK_SHADER_STAGE_TESS_EVALUATION_BIT                     = VK_BIT(2),
@@ -1044,8 +1059,7 @@ typedef VkFlags VkCmdBufferCreateFlags;
 
 // Command buffer optimization flags
 typedef VkFlags VkCmdBufferOptimizeFlags;
-typedef enum VkCmdBufferOptimizeFlagBits_
-{
+typedef enum {
     VK_CMD_BUFFER_OPTIMIZE_SMALL_BATCH_BIT                  = VK_BIT(0),
     VK_CMD_BUFFER_OPTIMIZE_PIPELINE_SWITCH_BIT              = VK_BIT(1),
     VK_CMD_BUFFER_OPTIMIZE_ONE_TIME_SUBMIT_BIT              = VK_BIT(2),
@@ -1054,15 +1068,13 @@ typedef enum VkCmdBufferOptimizeFlagBits_
 
 // Query control flags
 typedef VkFlags VkQueryControlFlags;
-typedef enum VkQueryControlFlagBits_
-{
+typedef enum {
     VK_QUERY_CONTROL_CONSERVATIVE_BIT                       = VK_BIT(0),    // Allow conservative results to be collected by the query
 } VkQueryControlFlagBits;
 
 // Memory output flags passed to resource transition commands
 typedef VkFlags VkMemoryOutputFlags;
-typedef enum VkMemoryOutputFlagBits_
-{
+typedef enum {
     VK_MEMORY_OUTPUT_CPU_WRITE_BIT                          = VK_BIT(0),    // Controls output coherency of CPU writes
     VK_MEMORY_OUTPUT_SHADER_WRITE_BIT                       = VK_BIT(1),    // Controls output coherency of generic shader writes
     VK_MEMORY_OUTPUT_COLOR_ATTACHMENT_BIT                   = VK_BIT(2),    // Controls output coherency of color attachment writes
@@ -1072,8 +1084,7 @@ typedef enum VkMemoryOutputFlagBits_
 
 // Memory input flags passed to resource transition commands
 typedef VkFlags VkMemoryInputFlags;
-typedef enum VkMemoryInputFlagBits_
-{
+typedef enum {
     VK_MEMORY_INPUT_CPU_READ_BIT                            = VK_BIT(0),    // Controls input coherency of CPU reads
     VK_MEMORY_INPUT_INDIRECT_COMMAND_BIT                    = VK_BIT(1),    // Controls input coherency of indirect command reads
     VK_MEMORY_INPUT_INDEX_FETCH_BIT                         = VK_BIT(2),    // Controls input coherency of index fetches
@@ -1085,32 +1096,28 @@ typedef enum VkMemoryInputFlagBits_
     VK_MEMORY_INPUT_TRANSFER_BIT                            = VK_BIT(8),    // Controls input coherency of transfer operations
 } VkMemoryInputFlagBits;
 
-typedef enum VkProvokingVertex_
-{
+typedef enum {
     VK_PROVOKING_VERTEX_FIRST                               = 0x00000000,
     VK_PROVOKING_VERTEX_LAST                                = 0x00000001,
 
     VK_ENUM_RANGE(PROVOKING_VERTEX, FIRST, LAST)
 } VkProvokingVertex;
 
-typedef enum VkCoordinateOrigin_
-{
+typedef enum {
     VK_COORDINATE_ORIGIN_UPPER_LEFT                         = 0x00000000,
     VK_COORDINATE_ORIGIN_LOWER_LEFT                         = 0x00000001,
 
     VK_ENUM_RANGE(COORDINATE_ORIGIN, UPPER_LEFT, LOWER_LEFT)
 } VkCoordinateOrigin;
 
-typedef enum VkDepthMode_
-{
+typedef enum {
     VK_DEPTH_MODE_ZERO_TO_ONE                               = 0x00000000,
     VK_DEPTH_MODE_NEGATIVE_ONE_TO_ONE                       = 0x00000001,
 
     VK_ENUM_RANGE(DEPTH_MODE, ZERO_TO_ONE, NEGATIVE_ONE_TO_ONE)
 } VkDepthMode;
 
-typedef enum VkPhysicalDeviceInfoType_
-{
+typedef enum {
     // Info type for vkGetPhysicalDeviceInfo()
     VK_PHYSICAL_DEVICE_INFO_TYPE_PROPERTIES                 = 0x00000000,
     VK_PHYSICAL_DEVICE_INFO_TYPE_PERFORMANCE                = 0x00000001,
@@ -1120,8 +1127,7 @@ typedef enum VkPhysicalDeviceInfoType_
     VK_ENUM_RANGE(PHYSICAL_DEVICE_INFO_TYPE, PROPERTIES, MEMORY_PROPERTIES)
 } VkPhysicalDeviceInfoType;
 
-typedef enum VkExtensionInfoType_
-{
+typedef enum {
     // Info type for vkGetGlobalExtensionInfo() and vkGetPhysicalDeviceExtensionInfo()
     VK_EXTENSION_INFO_TYPE_COUNT                            = 0x00000000,
     VK_EXTENSION_INFO_TYPE_PROPERTIES                       = 0x00000001,
@@ -1129,24 +1135,21 @@ typedef enum VkExtensionInfoType_
     VK_ENUM_RANGE(EXTENSION_INFO_TYPE, COUNT, PROPERTIES)
 } VkExtensionInfoType;
 
-typedef enum VkFormatInfoType_
-{
+typedef enum {
     // Info type for vkGetFormatInfo()
     VK_FORMAT_INFO_TYPE_PROPERTIES                          = 0x00000000,
 
     VK_ENUM_RANGE(FORMAT_INFO_TYPE, PROPERTIES, PROPERTIES)
 } VkFormatInfoType;
 
-typedef enum VkSubresourceInfoType_
-{
+typedef enum {
     // Info type for vkGetImageSubresourceInfo()
     VK_SUBRESOURCE_INFO_TYPE_LAYOUT                         = 0x00000000,
 
     VK_ENUM_RANGE(SUBRESOURCE_INFO_TYPE, LAYOUT, LAYOUT)
 } VkSubresourceInfoType;
 
-typedef enum VkObjectInfoType_
-{
+typedef enum {
     // Info type for vkGetObjectInfo()
     VK_OBJECT_INFO_TYPE_MEMORY_ALLOCATION_COUNT             = 0x00000000,
     VK_OBJECT_INFO_TYPE_MEMORY_REQUIREMENTS                 = 0x00000001,
@@ -1157,8 +1160,7 @@ typedef enum VkObjectInfoType_
 
 // Physical device compatibility flags
 typedef VkFlags VkPhysicalDeviceCompatibilityFlags;
-typedef enum VkPhysicalDeviceCompatibilityFlagBits_
-{
+typedef enum {
     VK_PHYSICAL_DEVICE_COMPATIBILITY_FEATURES_BIT           = VK_BIT(0),
     VK_PHYSICAL_DEVICE_COMPATIBILITY_IQ_MATCH_BIT           = VK_BIT(1),
     VK_PHYSICAL_DEVICE_COMPATIBILITY_PEER_TRANSFER_BIT      = VK_BIT(2),