Add tests for VK_KHR_image_format_list
[platform/upstream/VK-GL-CTS.git] / external / vulkancts / framework / vulkan / vkBasicTypes.inl
index a1e8b44..fcc48d3 100644 (file)
@@ -5,12 +5,14 @@
 #define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE       (static_cast<size_t>                    (256))
 #define VK_MAX_EXTENSION_NAME_SIZE                     (static_cast<size_t>                    (256))
 #define VK_UUID_SIZE                                           (static_cast<size_t>                    (16))
+#define VK_LUID_SIZE_KHR                                       (static_cast<size_t>                    (8))
 #define VK_MAX_MEMORY_TYPES                                    (static_cast<size_t>                    (32))
 #define VK_MAX_MEMORY_HEAPS                                    (static_cast<size_t>                    (16))
 #define VK_MAX_DESCRIPTION_SIZE                                (static_cast<size_t>                    (256))
 #define VK_ATTACHMENT_UNUSED                           (static_cast<deUint32>                  ((~0U)))
 #define VK_SUBPASS_EXTERNAL                                    (static_cast<deUint32>                  ((~0U)))
 #define VK_QUEUE_FAMILY_IGNORED                                (static_cast<deUint32>                  ((~0U)))
+#define VK_QUEUE_FAMILY_EXTERNAL_KHR           (static_cast<deUint32>                  ((~0U-1)))
 #define VK_REMAINING_MIP_LEVELS                                (static_cast<deUint32>                  ((~0U)))
 #define VK_REMAINING_ARRAY_LAYERS                      (static_cast<deUint32>                  ((~0U)))
 #define VK_WHOLE_SIZE                                          (static_cast<vk::VkDeviceSize>  ((~0ULL)))
@@ -46,9 +48,8 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE     (VkSurfaceKHR,                                  HANDLE_TYPE_SURFACE_KHR);
 VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkSwapchainKHR,                                HANDLE_TYPE_SWAPCHAIN_KHR);
 VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkDisplayKHR,                                  HANDLE_TYPE_DISPLAY_KHR);
 VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkDisplayModeKHR,                              HANDLE_TYPE_DISPLAY_MODE_KHR);
+VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkDescriptorUpdateTemplateKHR, HANDLE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR);
 VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkDebugReportCallbackEXT,              HANDLE_TYPE_DEBUG_REPORT_CALLBACK_EXT);
-VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkObjectTableNVX,                              HANDLE_TYPE_OBJECT_TABLE_NVX);
-VK_DEFINE_NON_DISPATCHABLE_HANDLE      (VkIndirectCommandsLayoutNVX,   HANDLE_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX);
 
 enum VkPipelineCacheHeaderVersion
 {
@@ -57,125 +58,167 @@ enum VkPipelineCacheHeaderVersion
 
 enum VkResult
 {
-       VK_SUCCESS                                                      = 0,
-       VK_NOT_READY                                            = 1,
-       VK_TIMEOUT                                                      = 2,
-       VK_EVENT_SET                                            = 3,
-       VK_EVENT_RESET                                          = 4,
-       VK_INCOMPLETE                                           = 5,
-       VK_ERROR_OUT_OF_HOST_MEMORY                     = -1,
-       VK_ERROR_OUT_OF_DEVICE_MEMORY           = -2,
-       VK_ERROR_INITIALIZATION_FAILED          = -3,
-       VK_ERROR_DEVICE_LOST                            = -4,
-       VK_ERROR_MEMORY_MAP_FAILED                      = -5,
-       VK_ERROR_LAYER_NOT_PRESENT                      = -6,
-       VK_ERROR_EXTENSION_NOT_PRESENT          = -7,
-       VK_ERROR_FEATURE_NOT_PRESENT            = -8,
-       VK_ERROR_INCOMPATIBLE_DRIVER            = -9,
-       VK_ERROR_TOO_MANY_OBJECTS                       = -10,
-       VK_ERROR_FORMAT_NOT_SUPPORTED           = -11,
-       VK_ERROR_FRAGMENTED_POOL                        = -12,
-       VK_ERROR_SURFACE_LOST_KHR                       = -1000000000,
-       VK_ERROR_NATIVE_WINDOW_IN_USE_KHR       = -1000000001,
-       VK_SUBOPTIMAL_KHR                                       = 1000001003,
-       VK_ERROR_OUT_OF_DATE_KHR                        = -1000001004,
-       VK_ERROR_INCOMPATIBLE_DISPLAY_KHR       = -1000003001,
-       VK_ERROR_VALIDATION_FAILED_EXT          = -1000011001,
-       VK_ERROR_INVALID_SHADER_NV                      = -1000012000,
-       VK_ERROR_OUT_OF_POOL_MEMORY_KHR         = -1000069000,
+       VK_SUCCESS                                                              = 0,
+       VK_NOT_READY                                                    = 1,
+       VK_TIMEOUT                                                              = 2,
+       VK_EVENT_SET                                                    = 3,
+       VK_EVENT_RESET                                                  = 4,
+       VK_INCOMPLETE                                                   = 5,
+       VK_ERROR_OUT_OF_HOST_MEMORY                             = -1,
+       VK_ERROR_OUT_OF_DEVICE_MEMORY                   = -2,
+       VK_ERROR_INITIALIZATION_FAILED                  = -3,
+       VK_ERROR_DEVICE_LOST                                    = -4,
+       VK_ERROR_MEMORY_MAP_FAILED                              = -5,
+       VK_ERROR_LAYER_NOT_PRESENT                              = -6,
+       VK_ERROR_EXTENSION_NOT_PRESENT                  = -7,
+       VK_ERROR_FEATURE_NOT_PRESENT                    = -8,
+       VK_ERROR_INCOMPATIBLE_DRIVER                    = -9,
+       VK_ERROR_TOO_MANY_OBJECTS                               = -10,
+       VK_ERROR_FORMAT_NOT_SUPPORTED                   = -11,
+       VK_ERROR_FRAGMENTED_POOL                                = -12,
+       VK_ERROR_SURFACE_LOST_KHR                               = -1000000000,
+       VK_ERROR_NATIVE_WINDOW_IN_USE_KHR               = -1000000001,
+       VK_SUBOPTIMAL_KHR                                               = 1000001003,
+       VK_ERROR_OUT_OF_DATE_KHR                                = -1000001004,
+       VK_ERROR_INCOMPATIBLE_DISPLAY_KHR               = -1000003001,
+       VK_ERROR_VALIDATION_FAILED_EXT                  = -1000011001,
+       VK_ERROR_INVALID_SHADER_NV                              = -1000012000,
+       VK_ERROR_OUT_OF_POOL_MEMORY_KHR                 = -1000069000,
+       VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR    = -1000072003,
 };
 
 enum VkStructureType
 {
-       VK_STRUCTURE_TYPE_APPLICATION_INFO                                                                              = 0,
-       VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO                                                                  = 1,
-       VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO                                                              = 2,
-       VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO                                                                    = 3,
-       VK_STRUCTURE_TYPE_SUBMIT_INFO                                                                                   = 4,
-       VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO                                                                  = 5,
-       VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE                                                                   = 6,
-       VK_STRUCTURE_TYPE_BIND_SPARSE_INFO                                                                              = 7,
-       VK_STRUCTURE_TYPE_FENCE_CREATE_INFO                                                                             = 8,
-       VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO                                                                 = 9,
-       VK_STRUCTURE_TYPE_EVENT_CREATE_INFO                                                                             = 10,
-       VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO                                                                = 11,
-       VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO                                                                    = 12,
-       VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO                                                               = 13,
-       VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO                                                                             = 14,
-       VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO                                                                = 15,
-       VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO                                                             = 16,
-       VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO                                                    = 17,
-       VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO                                             = 18,
-       VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO                               = 19,
-       VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO                             = 20,
-       VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO                               = 21,
-       VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO                                   = 22,
-       VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO                              = 23,
-       VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO                                = 24,
-       VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO                              = 25,
-       VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO                                = 26,
-       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO                                    = 27,
-       VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO                                                 = 28,
-       VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO                                                  = 29,
-       VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO                                                   = 30,
-       VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO                                                                   = 31,
-       VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO                                             = 32,
-       VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO                                                   = 33,
-       VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO                                                  = 34,
-       VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET                                                                  = 35,
-       VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET                                                                   = 36,
-       VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO                                                               = 37,
-       VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO                                                               = 38,
-       VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO                                                              = 39,
-       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO                                                  = 40,
-       VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO                                               = 41,
-       VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO                                                             = 42,
-       VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO                                                                = 43,
-       VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER                                                                 = 44,
-       VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER                                                                  = 45,
-       VK_STRUCTURE_TYPE_MEMORY_BARRIER                                                                                = 46,
-       VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO                                                   = 47,
-       VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO                                                             = 48,
-       VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR                                                             = 1000001000,
-       VK_STRUCTURE_TYPE_PRESENT_INFO_KHR                                                                              = 1000001001,
-       VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR                                                  = 1000002000,
-       VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR                                               = 1000002001,
-       VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR                                                              = 1000003000,
-       VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR                                                  = 1000004000,
-       VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR                                                   = 1000005000,
-       VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR                                               = 1000006000,
-       VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR                                                   = 1000007000,
-       VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR                                               = 1000008000,
-       VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR                                                 = 1000009000,
-       VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT                                 = 1000011000,
-       VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD  = 1000018000,
-       VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_NAME_INFO_EXT                                             = 1000022000,
-       VK_STRUCTURE_TYPE_DEBUG_MARKER_OBJECT_TAG_INFO_EXT                                              = 1000022001,
-       VK_STRUCTURE_TYPE_DEBUG_MARKER_MARKER_INFO_EXT                                                  = 1000022002,
-       VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_IMAGE_CREATE_INFO_NV                             = 1000026000,
-       VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV                    = 1000026001,
-       VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV                  = 1000026002,
-       VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV                                  = 1000056000,
-       VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV                                                = 1000056001,
-       VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV                                    = 1000057000,
-       VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV                                    = 1000057001,
-       VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV                             = 1000058000,
-       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR                                                = 1000059000,
-       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR                                              = 1000059001,
-       VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR                                                               = 1000059002,
-       VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR                                                 = 1000059003,
-       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR                               = 1000059004,
-       VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR                                                 = 1000059005,
-       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR                               = 1000059006,
-       VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR                                  = 1000059007,
-       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR                = 1000059008,
-       VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT                                                                  = 1000061000,
-       VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX                                                  = 1000086000,
-       VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX                              = 1000086001,
-       VK_STRUCTURE_TYPE_CMD_PROCESS_COMMANDS_INFO_NVX                                                 = 1000086002,
-       VK_STRUCTURE_TYPE_CMD_RESERVE_SPACE_FOR_COMMANDS_INFO_NVX                               = 1000086003,
-       VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_LIMITS_NVX                                  = 1000086004,
-       VK_STRUCTURE_TYPE_DEVICE_GENERATED_COMMANDS_FEATURES_NVX                                = 1000086005,
+       VK_STRUCTURE_TYPE_APPLICATION_INFO                                                                                      = 0,
+       VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO                                                                          = 1,
+       VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO                                                                      = 2,
+       VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO                                                                            = 3,
+       VK_STRUCTURE_TYPE_SUBMIT_INFO                                                                                           = 4,
+       VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO                                                                          = 5,
+       VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE                                                                           = 6,
+       VK_STRUCTURE_TYPE_BIND_SPARSE_INFO                                                                                      = 7,
+       VK_STRUCTURE_TYPE_FENCE_CREATE_INFO                                                                                     = 8,
+       VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO                                                                         = 9,
+       VK_STRUCTURE_TYPE_EVENT_CREATE_INFO                                                                                     = 10,
+       VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO                                                                        = 11,
+       VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO                                                                            = 12,
+       VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO                                                                       = 13,
+       VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO                                                                                     = 14,
+       VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO                                                                        = 15,
+       VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO                                                                     = 16,
+       VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO                                                            = 17,
+       VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO                                                     = 18,
+       VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO                                       = 19,
+       VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO                                     = 20,
+       VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO                                       = 21,
+       VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO                                           = 22,
+       VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO                                      = 23,
+       VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO                                        = 24,
+       VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO                                      = 25,
+       VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO                                        = 26,
+       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO                                            = 27,
+       VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO                                                         = 28,
+       VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO                                                          = 29,
+       VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO                                                           = 30,
+       VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO                                                                           = 31,
+       VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO                                                     = 32,
+       VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO                                                           = 33,
+       VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO                                                          = 34,
+       VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET                                                                          = 35,
+       VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET                                                                           = 36,
+       VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO                                                                       = 37,
+       VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO                                                                       = 38,
+       VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO                                                                      = 39,
+       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO                                                          = 40,
+       VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO                                                       = 41,
+       VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO                                                                     = 42,
+       VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO                                                                        = 43,
+       VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER                                                                         = 44,
+       VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER                                                                          = 45,
+       VK_STRUCTURE_TYPE_MEMORY_BARRIER                                                                                        = 46,
+       VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO                                                           = 47,
+       VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO                                                                     = 48,
+       VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR                                                                     = 1000001000,
+       VK_STRUCTURE_TYPE_PRESENT_INFO_KHR                                                                                      = 1000001001,
+       VK_STRUCTURE_TYPE_DISPLAY_MODE_CREATE_INFO_KHR                                                          = 1000002000,
+       VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR                                                       = 1000002001,
+       VK_STRUCTURE_TYPE_DISPLAY_PRESENT_INFO_KHR                                                                      = 1000003000,
+       VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR                                                          = 1000004000,
+       VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR                                                           = 1000005000,
+       VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR                                                       = 1000006000,
+       VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR                                                           = 1000007000,
+       VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR                                                       = 1000008000,
+       VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR                                                         = 1000009000,
+       VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT                                         = 1000011000,
+       VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX                                         = 1000053000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX                                        = 1000053001,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX                                      = 1000053002,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR                                                        = 1000059000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR                                                      = 1000059001,
+       VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR                                                                       = 1000059002,
+       VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR                                                         = 1000059003,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR                                       = 1000059004,
+       VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR                                                         = 1000059005,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR                                       = 1000059006,
+       VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR                                          = 1000059007,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR                        = 1000059008,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR                        = 1000071000,
+       VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR                                          = 1000071001,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHR                                      = 1000071002,
+       VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHR                                                        = 1000071003,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR                                                     = 1000071004,
+       VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR                                        = 1000072000,
+       VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR                                         = 1000072001,
+       VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR                                                       = 1000072002,
+       VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR                                           = 1000073000,
+       VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR                                           = 1000073001,
+       VK_STRUCTURE_TYPE_MEMORY_WIN32_HANDLE_PROPERTIES_KHR                                            = 1000073002,
+       VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR                                                      = 1000073003,
+       VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR                                                                     = 1000074000,
+       VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR                                                                      = 1000074001,
+       VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR                                                                        = 1000074002,
+       VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR                            = 1000075000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR                           = 1000076000,
+       VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHR                                                     = 1000076001,
+       VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHR                                                      = 1000077000,
+       VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR                                        = 1000078000,
+       VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR                                        = 1000078001,
+       VK_STRUCTURE_TYPE_D3D12_FENCE_SUBMIT_INFO_KHR                                                           = 1000078002,
+       VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR                                           = 1000078003,
+       VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR                                                          = 1000079000,
+       VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR                                                                     = 1000079001,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR                        = 1000080000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR                            = 1000083000,
+       VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR                                                                           = 1000084000,
+       VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR                            = 1000085000,
+       VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE                                                                     = 1000092000,
+       VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR                                       = 1000111000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO_KHR                                       = 1000112000,
+       VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES_KHR                                                         = 1000112001,
+       VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO_KHR                                                          = 1000113000,
+       VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR                                            = 1000114000,
+       VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR                                            = 1000114001,
+       VK_STRUCTURE_TYPE_FENCE_GET_WIN32_HANDLE_INFO_KHR                                                       = 1000114002,
+       VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR                                                                      = 1000115000,
+       VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR                                                                         = 1000115001,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR                         = 1000117000,
+       VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR           = 1000117001,
+       VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR                                                      = 1000117002,
+       VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR     = 1000117003,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR                                            = 1000119000,
+       VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR                                                            = 1000119001,
+       VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR                                                                          = 1000119002,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR                         = 1000120000,
+       VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR                                                     = 1000127000,
+       VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR                                            = 1000127001,
+       VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR                                         = 1000146000,
+       VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR                                          = 1000146001,
+       VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR                                                     = 1000147000,
+       VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR                           = 1000146002,
+       VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR                                                                     = 1000146003,
+       VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR                                        = 1000146004,
+       VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR                                                           = 1000157000,
+       VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR                                                            = 1000157001,
 };
 
 enum VkSystemAllocationScope
@@ -383,14 +426,8 @@ enum VkFormat
        VK_FORMAT_ASTC_12x10_SRGB_BLOCK                 = 182,
        VK_FORMAT_ASTC_12x12_UNORM_BLOCK                = 183,
        VK_FORMAT_ASTC_12x12_SRGB_BLOCK                 = 184,
-       VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG   = 1000054000,
-       VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG   = 1000054001,
-       VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG   = 1000054002,
-       VK_FORMAT_PVRTC2_4BPP_UNORM_BLOCK_IMG   = 1000054003,
-       VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG    = 1000054004,
-       VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG    = 1000054005,
-       VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG    = 1000054006,
-       VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG    = 1000054007,
+
+       VK_FORMAT_LAST
 };
 
 enum VkImageType
@@ -440,16 +477,19 @@ enum VkSharingMode
 
 enum VkImageLayout
 {
-       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_TRANSFER_SRC_OPTIMAL                            = 6,
-       VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL                            = 7,
-       VK_IMAGE_LAYOUT_PREINITIALIZED                                          = 8,
-       VK_IMAGE_LAYOUT_PRESENT_SRC_KHR                                         = 1000001002,
+       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_TRANSFER_SRC_OPTIMAL                                                    = 6,
+       VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL                                                    = 7,
+       VK_IMAGE_LAYOUT_PREINITIALIZED                                                                  = 8,
+       VK_IMAGE_LAYOUT_PRESENT_SRC_KHR                                                                 = 1000001002,
+       VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR                                                              = 1000111000,
+       VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR  = 1000117000,
+       VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR  = 1000117001,
 };
 
 enum VkImageViewType
@@ -625,7 +665,8 @@ enum VkFilter
 {
        VK_FILTER_NEAREST       = 0,
        VK_FILTER_LINEAR        = 1,
-       VK_FILTER_CUBIC_IMG     = 1000015000,
+
+       VK_FILTER_LAST
 };
 
 enum VkSamplerMipmapMode
@@ -725,124 +766,157 @@ enum VkSubpassContents
        VK_SUBPASS_CONTENTS_LAST
 };
 
-enum VkColorSpaceKHR
-{
-       VK_COLOR_SPACE_SRGB_NONLINEAR_KHR       = 0,
-
-       VK_COLOR_SPACE_KHR_LAST
+enum VkObjectType
+{
+       VK_OBJECT_TYPE_UNKNOWN                                                  = 0,
+       VK_OBJECT_TYPE_INSTANCE                                                 = 1,
+       VK_OBJECT_TYPE_PHYSICAL_DEVICE                                  = 2,
+       VK_OBJECT_TYPE_DEVICE                                                   = 3,
+       VK_OBJECT_TYPE_QUEUE                                                    = 4,
+       VK_OBJECT_TYPE_SEMAPHORE                                                = 5,
+       VK_OBJECT_TYPE_COMMAND_BUFFER                                   = 6,
+       VK_OBJECT_TYPE_FENCE                                                    = 7,
+       VK_OBJECT_TYPE_DEVICE_MEMORY                                    = 8,
+       VK_OBJECT_TYPE_BUFFER                                                   = 9,
+       VK_OBJECT_TYPE_IMAGE                                                    = 10,
+       VK_OBJECT_TYPE_EVENT                                                    = 11,
+       VK_OBJECT_TYPE_QUERY_POOL                                               = 12,
+       VK_OBJECT_TYPE_BUFFER_VIEW                                              = 13,
+       VK_OBJECT_TYPE_IMAGE_VIEW                                               = 14,
+       VK_OBJECT_TYPE_SHADER_MODULE                                    = 15,
+       VK_OBJECT_TYPE_PIPELINE_CACHE                                   = 16,
+       VK_OBJECT_TYPE_PIPELINE_LAYOUT                                  = 17,
+       VK_OBJECT_TYPE_RENDER_PASS                                              = 18,
+       VK_OBJECT_TYPE_PIPELINE                                                 = 19,
+       VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT                    = 20,
+       VK_OBJECT_TYPE_SAMPLER                                                  = 21,
+       VK_OBJECT_TYPE_DESCRIPTOR_POOL                                  = 22,
+       VK_OBJECT_TYPE_DESCRIPTOR_SET                                   = 23,
+       VK_OBJECT_TYPE_FRAMEBUFFER                                              = 24,
+       VK_OBJECT_TYPE_COMMAND_POOL                                             = 25,
+       VK_OBJECT_TYPE_SURFACE_KHR                                              = 1000000000,
+       VK_OBJECT_TYPE_SWAPCHAIN_KHR                                    = 1000001000,
+       VK_OBJECT_TYPE_DISPLAY_KHR                                              = 1000002000,
+       VK_OBJECT_TYPE_DISPLAY_MODE_KHR                                 = 1000002001,
+       VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT                = 1000011000,
+       VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR   = 1000085000,
+       VK_OBJECT_TYPE_OBJECT_TABLE_NVX                                 = 1000086000,
+       VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX             = 1000086001,
 };
 
-enum VkPresentModeKHR
+enum VkColorSpaceKHR
 {
-       VK_PRESENT_MODE_IMMEDIATE_KHR           = 0,
-       VK_PRESENT_MODE_MAILBOX_KHR                     = 1,
-       VK_PRESENT_MODE_FIFO_KHR                        = 2,
-       VK_PRESENT_MODE_FIFO_RELAXED_KHR        = 3,
-
-       VK_PRESENT_MODE_KHR_LAST
+       VK_COLOR_SPACE_SRGB_NONLINEAR_KHR               = 0,
+       VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104001,
+       VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT = 1000104002,
+       VK_COLOR_SPACE_DCI_P3_LINEAR_EXT                = 1000104003,
+       VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT             = 1000104004,
+       VK_COLOR_SPACE_BT709_LINEAR_EXT                 = 1000104005,
+       VK_COLOR_SPACE_BT709_NONLINEAR_EXT              = 1000104006,
+       VK_COLOR_SPACE_BT2020_LINEAR_EXT                = 1000104007,
+       VK_COLOR_SPACE_HDR10_ST2084_EXT                 = 1000104008,
+       VK_COLOR_SPACE_DOLBYVISION_EXT                  = 1000104009,
+       VK_COLOR_SPACE_HDR10_HLG_EXT                    = 1000104010,
+       VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT              = 1000104011,
+       VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT   = 1000104012,
+       VK_COLOR_SPACE_PASS_THROUGH_EXT                 = 1000104013,
 };
 
-enum VkDebugReportObjectTypeEXT
+enum VkPresentModeKHR
 {
-       VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT                                 = 0,
-       VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT                                = 1,
-       VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT                 = 2,
-       VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT                                  = 3,
-       VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT                                   = 4,
-       VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT                               = 5,
-       VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT                  = 6,
-       VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT                                   = 7,
-       VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT                   = 8,
-       VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT                                  = 9,
-       VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT                                   = 10,
-       VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT                                   = 11,
-       VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT                              = 12,
-       VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT                             = 13,
-       VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT                              = 14,
-       VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT                   = 15,
-       VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT                  = 16,
-       VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT                 = 17,
-       VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT                             = 18,
-       VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT                                = 19,
-       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT   = 20,
-       VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT                                 = 21,
-       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT                 = 22,
-       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT                  = 23,
-       VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT                             = 24,
-       VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT                    = 25,
-       VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT                             = 26,
-       VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT                   = 27,
-       VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT                    = 28,
-
-       VK_DEBUG_REPORT_OBJECT_TYPE_EXT_LAST
+       VK_PRESENT_MODE_IMMEDIATE_KHR                                   = 0,
+       VK_PRESENT_MODE_MAILBOX_KHR                                             = 1,
+       VK_PRESENT_MODE_FIFO_KHR                                                = 2,
+       VK_PRESENT_MODE_FIFO_RELAXED_KHR                                = 3,
+       VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR               = 1000111000,
+       VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR   = 1000111001,
 };
 
-enum VkDebugReportErrorEXT
+enum VkDescriptorUpdateTemplateTypeKHR
 {
-       VK_DEBUG_REPORT_ERROR_NONE_EXT                  = 0,
-       VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT  = 1,
+       VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR   = 0,
+       VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = 1,
 
-       VK_DEBUG_REPORT_ERROR_EXT_LAST
+       VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_KHR_LAST
 };
 
-enum VkRasterizationOrderAMD
+enum VkPointClippingBehaviorKHR
 {
-       VK_RASTERIZATION_ORDER_STRICT_AMD       = 0,
-       VK_RASTERIZATION_ORDER_RELAXED_AMD      = 1,
+       VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES_KHR                  = 0,
+       VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY_KHR    = 1,
 
-       VK_RASTERIZATION_ORDER_AMD_LAST
+       VK_POINT_CLIPPING_BEHAVIOR_KHR_LAST
 };
 
-enum VkValidationCheckEXT
+enum VkTessellationDomainOriginKHR
 {
-       VK_VALIDATION_CHECK_ALL_EXT     = 0,
+       VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT_KHR    = 0,
+       VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT_KHR    = 1,
 
-       VK_VALIDATION_CHECK_EXT_LAST
+       VK_TESSELLATION_DOMAIN_ORIGIN_KHR_LAST
 };
 
-enum VkIndirectCommandsTokenTypeNVX
+enum VkDebugReportObjectTypeEXT
 {
-       VK_INDIRECT_COMMANDS_TOKEN_PIPELINE_NVX                 = 0,
-       VK_INDIRECT_COMMANDS_TOKEN_DESCRIPTOR_SET_NVX   = 1,
-       VK_INDIRECT_COMMANDS_TOKEN_INDEX_BUFFER_NVX             = 2,
-       VK_INDIRECT_COMMANDS_TOKEN_VERTEX_BUFFER_NVX    = 3,
-       VK_INDIRECT_COMMANDS_TOKEN_PUSH_CONSTANT_NVX    = 4,
-       VK_INDIRECT_COMMANDS_TOKEN_DRAW_INDEXED_NVX             = 5,
-       VK_INDIRECT_COMMANDS_TOKEN_DRAW_NVX                             = 6,
-       VK_INDIRECT_COMMANDS_TOKEN_DISPATCH_NVX                 = 7,
-
-       VK_INDIRECT_COMMANDS_TOKEN_TYPE_NVX_LAST
+       VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT                                                 = 0,
+       VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT                                                = 1,
+       VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT                                 = 2,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT                                                  = 3,
+       VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT                                                   = 4,
+       VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT                                               = 5,
+       VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT                                  = 6,
+       VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT                                                   = 7,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT                                   = 8,
+       VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT                                                  = 9,
+       VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT                                                   = 10,
+       VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT                                                   = 11,
+       VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT                                              = 12,
+       VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT                                             = 13,
+       VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT                                              = 14,
+       VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT                                   = 15,
+       VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT                                  = 16,
+       VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT                                 = 17,
+       VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT                                             = 18,
+       VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT                                                = 19,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT                   = 20,
+       VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT                                                 = 21,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT                                 = 22,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT                                  = 23,
+       VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT                                             = 24,
+       VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT                                    = 25,
+       VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT                                             = 26,
+       VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT                                   = 27,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT                                    = 28,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT                                             = 29,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT                                = 30,
+       VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT  = 1000085000,
 };
 
-enum VkObjectEntryTypeNVX
+enum VkDebugReportErrorEXT
 {
-       VK_OBJECT_ENTRY_DESCRIPTOR_SET_NVX      = 0,
-       VK_OBJECT_ENTRY_PIPELINE_NVX            = 1,
-       VK_OBJECT_ENTRY_INDEX_BUFFER_NVX        = 2,
-       VK_OBJECT_ENTRY_VERTEX_BUFFER_NVX       = 3,
-       VK_OBJECT_ENTRY_PUSH_CONSTANT_NVX       = 4,
+       VK_DEBUG_REPORT_ERROR_NONE_EXT                  = 0,
+       VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT  = 1,
 
-       VK_OBJECT_ENTRY_TYPE_NVX_LAST
+       VK_DEBUG_REPORT_ERROR_EXT_LAST
 };
 
 enum VkFormatFeatureFlagBits
 {
-       VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT                                             = 0x00000001,
-       VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT                                             = 0x00000002,
-       VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT                              = 0x00000004,
-       VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT                              = 0x00000008,
-       VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT                              = 0x00000010,
-       VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT               = 0x00000020,
-       VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT                                             = 0x00000040,
-       VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT                                  = 0x00000080,
-       VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT                    = 0x00000100,
-       VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT                  = 0x00000200,
-       VK_FORMAT_FEATURE_BLIT_SRC_BIT                                                  = 0x00000400,
-       VK_FORMAT_FEATURE_BLIT_DST_BIT                                                  = 0x00000800,
-       VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT               = 0x00001000,
-       VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG    = 0x00002000,
-       VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR                                  = 0x00004000,
-       VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR                                  = 0x00008000,
+       VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT                                     = 0x00000001,
+       VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT                                     = 0x00000002,
+       VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT                      = 0x00000004,
+       VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT                      = 0x00000008,
+       VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT                      = 0x00000010,
+       VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_ATOMIC_BIT       = 0x00000020,
+       VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT                                     = 0x00000040,
+       VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT                          = 0x00000080,
+       VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT            = 0x00000100,
+       VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT          = 0x00000200,
+       VK_FORMAT_FEATURE_BLIT_SRC_BIT                                          = 0x00000400,
+       VK_FORMAT_FEATURE_BLIT_DST_BIT                                          = 0x00000800,
+       VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT       = 0x00001000,
+       VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR                          = 0x00004000,
+       VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR                          = 0x00008000,
 };
 typedef deUint32 VkFormatFeatureFlags;
 
@@ -861,12 +935,16 @@ typedef deUint32 VkImageUsageFlags;
 
 enum VkImageCreateFlagBits
 {
-       VK_IMAGE_CREATE_SPARSE_BINDING_BIT                      = 0x00000001,
-       VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT            = 0x00000002,
-       VK_IMAGE_CREATE_SPARSE_ALIASED_BIT                      = 0x00000004,
-       VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT                      = 0x00000008,
-       VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT                     = 0x00000010,
-       VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR     = 0x00000020,
+       VK_IMAGE_CREATE_SPARSE_BINDING_BIT                                      = 0x00000001,
+       VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT                            = 0x00000002,
+       VK_IMAGE_CREATE_SPARSE_ALIASED_BIT                                      = 0x00000004,
+       VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT                                      = 0x00000008,
+       VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT                                     = 0x00000010,
+       VK_IMAGE_CREATE_BIND_SFR_BIT_KHX                                        = 0x00000040,
+       VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR                     = 0x00000020,
+       VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT_KHR     = 0x00000080,
+       VK_IMAGE_CREATE_EXTENDED_USAGE_BIT_KHR                          = 0x00000100,
+       VK_IMAGE_CREATE_ALIAS_BIT_KHR                                           = 0x00000400,
 };
 typedef deUint32 VkImageCreateFlags;
 
@@ -903,7 +981,8 @@ typedef deUint32 VkMemoryPropertyFlags;
 
 enum VkMemoryHeapFlagBits
 {
-       VK_MEMORY_HEAP_DEVICE_LOCAL_BIT = 0x00000001,
+       VK_MEMORY_HEAP_DEVICE_LOCAL_BIT                 = 0x00000001,
+       VK_MEMORY_HEAP_MULTI_INSTANCE_BIT_KHX   = 0x00000002,
 };
 typedef deUint32 VkMemoryHeapFlags;
 
@@ -926,7 +1005,6 @@ enum VkPipelineStageFlagBits
        VK_PIPELINE_STAGE_HOST_BIT                                                              = 0x00004000,
        VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT                                              = 0x00008000,
        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT                                              = 0x00010000,
-       VK_PIPELINE_STAGE_COMMAND_PROCESS_BIT_NVX                               = 0x00020000,
 };
 typedef deUint32 VkPipelineStageFlags;
 
@@ -1008,9 +1086,11 @@ typedef deUint32 VkBufferUsageFlags;
 
 enum VkPipelineCreateFlagBits
 {
-       VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT     = 0x00000001,
-       VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT        = 0x00000002,
-       VK_PIPELINE_CREATE_DERIVATIVE_BIT                       = 0x00000004,
+       VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT                             = 0x00000001,
+       VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT                                = 0x00000002,
+       VK_PIPELINE_CREATE_DERIVATIVE_BIT                                               = 0x00000004,
+       VK_PIPELINE_CREATE_VIEW_INDEX_FROM_DEVICE_INDEX_BIT_KHX = 0x00000008,
+       VK_PIPELINE_CREATE_DISPATCH_BASE_KHX                                    = 0x00000010,
 };
 typedef deUint32 VkPipelineCreateFlags;
 
@@ -1045,6 +1125,12 @@ enum VkColorComponentFlagBits
 };
 typedef deUint32 VkColorComponentFlags;
 
+enum VkDescriptorSetLayoutCreateFlagBits
+{
+       VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR = 0x00000001,
+};
+typedef deUint32 VkDescriptorSetLayoutCreateFlags;
+
 enum VkDescriptorPoolCreateFlagBits
 {
        VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT       = 0x00000001,
@@ -1057,6 +1143,8 @@ enum VkAttachmentDescriptionFlagBits
 };
 typedef deUint32 VkAttachmentDescriptionFlags;
 
+typedef deUint32 VkSubpassDescriptionFlags;
+
 enum VkAccessFlagBits
 {
        VK_ACCESS_INDIRECT_COMMAND_READ_BIT                             = 0x00000001,
@@ -1081,7 +1169,9 @@ typedef deUint32 VkAccessFlags;
 
 enum VkDependencyFlagBits
 {
-       VK_DEPENDENCY_BY_REGION_BIT     = 0x00000001,
+       VK_DEPENDENCY_BY_REGION_BIT                     = 0x00000001,
+       VK_DEPENDENCY_VIEW_LOCAL_BIT_KHX        = 0x00000002,
+       VK_DEPENDENCY_DEVICE_GROUP_BIT_KHX      = 0x00000004,
 };
 typedef deUint32 VkDependencyFlags;
 
@@ -1149,6 +1239,12 @@ enum VkCompositeAlphaFlagBitsKHR
 };
 typedef deUint32 VkCompositeAlphaFlagsKHR;
 
+enum VkSwapchainCreateFlagBitsKHR
+{
+       VK_SWAPCHAIN_CREATE_BIND_SFR_BIT_KHX    = 0x00000001,
+};
+typedef deUint32 VkSwapchainCreateFlagsKHR;
+
 enum VkDisplayPlaneAlphaFlagBitsKHR
 {
        VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR                                   = 0x00000001,
@@ -1158,6 +1254,28 @@ enum VkDisplayPlaneAlphaFlagBitsKHR
 };
 typedef deUint32 VkDisplayPlaneAlphaFlagsKHR;
 
+enum VkExternalFenceHandleTypeFlagBitsKHR
+{
+       VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR                 = 0x00000001,
+       VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR              = 0x00000002,
+       VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR  = 0x00000004,
+       VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR                   = 0x00000008,
+};
+typedef deUint32 VkExternalFenceHandleTypeFlagsKHR;
+
+enum VkExternalFenceFeatureFlagBitsKHR
+{
+       VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR    = 0x00000001,
+       VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR    = 0x00000002,
+};
+typedef deUint32 VkExternalFenceFeatureFlagsKHR;
+
+enum VkFenceImportFlagBitsKHR
+{
+       VK_FENCE_IMPORT_TEMPORARY_BIT_KHR       = 0x00000001,
+};
+typedef deUint32 VkFenceImportFlagsKHR;
+
 enum VkDebugReportFlagBitsEXT
 {
        VK_DEBUG_REPORT_INFORMATION_BIT_EXT                     = 0x00000001,
@@ -1168,38 +1286,48 @@ enum VkDebugReportFlagBitsEXT
 };
 typedef deUint32 VkDebugReportFlagsEXT;
 
-enum VkExternalMemoryHandleTypeFlagBitsNV
+enum VkExternalMemoryHandleTypeFlagBitsKHR
+{
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR                        = 0x00000001,
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR                     = 0x00000002,
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR         = 0x00000004,
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHR            = 0x00000008,
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHR        = 0x00000010,
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHR                       = 0x00000020,
+       VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR           = 0x00000040,
+};
+typedef deUint32 VkExternalMemoryHandleTypeFlagsKHR;
+
+enum VkExternalMemoryFeatureFlagBitsKHR
 {
-       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_NV              = 0x00000001,
-       VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_NV  = 0x00000002,
-       VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_BIT_NV               = 0x00000004,
-       VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_IMAGE_KMT_BIT_NV   = 0x00000008,
+       VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR       = 0x00000001,
+       VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR           = 0x00000002,
+       VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR           = 0x00000004,
 };
-typedef deUint32 VkExternalMemoryHandleTypeFlagsNV;
+typedef deUint32 VkExternalMemoryFeatureFlagsKHR;
 
-enum VkExternalMemoryFeatureFlagBitsNV
+enum VkExternalSemaphoreHandleTypeFlagBitsKHR
 {
-       VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_NV        = 0x00000001,
-       VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_NV            = 0x00000002,
-       VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_NV            = 0x00000004,
+       VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR                     = 0x00000001,
+       VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR          = 0x00000002,
+       VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR      = 0x00000004,
+       VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHR           = 0x00000008,
+       VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR                       = 0x00000010,
 };
-typedef deUint32 VkExternalMemoryFeatureFlagsNV;
+typedef deUint32 VkExternalSemaphoreHandleTypeFlagsKHR;
 
-enum VkIndirectCommandsLayoutUsageFlagBitsNVX
+enum VkExternalSemaphoreFeatureFlagBitsKHR
 {
-       VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NVX   = 0x00000001,
-       VK_INDIRECT_COMMANDS_LAYOUT_USAGE_SPARSE_SEQUENCES_BIT_NVX              = 0x00000002,
-       VK_INDIRECT_COMMANDS_LAYOUT_USAGE_EMPTY_EXECUTIONS_BIT_NVX              = 0x00000004,
-       VK_INDIRECT_COMMANDS_LAYOUT_USAGE_INDEXED_SEQUENCES_BIT_NVX             = 0x00000008,
+       VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR        = 0x00000001,
+       VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR        = 0x00000002,
 };
-typedef deUint32 VkIndirectCommandsLayoutUsageFlagsNVX;
+typedef deUint32 VkExternalSemaphoreFeatureFlagsKHR;
 
-enum VkObjectEntryUsageFlagBitsNVX
+enum VkSemaphoreImportFlagBitsKHR
 {
-       VK_OBJECT_ENTRY_USAGE_GRAPHICS_BIT_NVX  = 0x00000001,
-       VK_OBJECT_ENTRY_USAGE_COMPUTE_BIT_NVX   = 0x00000002,
+       VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR   = 0x00000001,
 };
-typedef deUint32 VkObjectEntryUsageFlagsNVX;
+typedef deUint32 VkSemaphoreImportFlagsKHR;
 
 typedef deUint32 VkInstanceCreateFlags;
 
@@ -1247,18 +1375,12 @@ typedef deUint32 VkPipelineLayoutCreateFlags;
 
 typedef deUint32 VkSamplerCreateFlags;
 
-typedef deUint32 VkDescriptorSetLayoutCreateFlags;
-
 typedef deUint32 VkDescriptorPoolResetFlags;
 
 typedef deUint32 VkFramebufferCreateFlags;
 
 typedef deUint32 VkRenderPassCreateFlags;
 
-typedef deUint32 VkSubpassDescriptionFlags;
-
-typedef deUint32 VkSwapchainCreateFlagsKHR;
-
 typedef deUint32 VkDisplayModeCreateFlagsKHR;
 
 typedef deUint32 VkDisplaySurfaceCreateFlagsKHR;
@@ -1277,6 +1399,8 @@ typedef deUint32 VkWin32SurfaceCreateFlagsKHR;
 
 typedef deUint32 VkCommandPoolTrimFlagsKHR;
 
+typedef deUint32 VkDescriptorUpdateTemplateCreateFlagsKHR;
+
 VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                                void*);
 VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                    deUintptr);
 VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                          deUint32);