projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c7f179 6a4b084)
Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.3.0
authorMatthew Netsch <quic_mnetsch@quicinc.com>
Fri, 22 Oct 2021 19:47:16 +0000 (15:47 -0400)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Fri, 22 Oct 2021 19:47:16 +0000 (15:47 -0400)
Change-Id: I9f1e4eba89eb77636a4b58312efa86ada45b0945

1  2 
external/vulkancts/framework/vulkan/vkBasicTypes.inl patch | diff1 | diff2 | blob | history
external/vulkancts/framework/vulkan/vkKnownDriverIds.inl patch | diff1 | diff2 | blob | history
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl patch | diff1 | diff2 | blob | history
external/vulkancts/framework/vulkan/vkVulkan_c.inl patch | diff1 | diff2 | blob | history
external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp patch | diff1 | diff2 | blob | history
external/vulkancts/scripts/gen_framework.py patch | diff1 | diff2 | blob | history
external/vulkancts/scripts/src/vulkan_core.h patch | diff1 | diff2 | blob | history

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
index 3ef3192,376b4f3..74a026a
--- 1/external/vulkancts/framework/vulkan/vkBasicTypes.inl
--- 2/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@@ -4032,246 -3881,117 +4035,246 @@@ typedef VkCommandPoolTrimFlags VkComman
  
  typedef VkDescriptorUpdateTemplateCreateFlags VkDescriptorUpdateTemplateCreateFlagsKHR;
  
 -typedef deUint64 VkPipelineStageFlags2KHR;
 -typedef deUint64 VkPipelineStageFlagBits2KHR;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_NONE_KHR                                                                 = 0ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR                                              = 0x00000001ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR                                            = 0x00000002ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR                                             = 0x00000004ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR                                            = 0x00000008ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR              = 0x00000010ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR           = 0x00000020ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR                                  = 0x00000040ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR                                  = 0x00000080ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR                             = 0x00000100ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR                              = 0x00000200ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR                  = 0x00000400ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR                                           = 0x00000800ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR                                             = 0x00001000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR                                                 = 0x00001000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR                                           = 0x00002000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_HOST_BIT_KHR                                                             = 0x00004000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR                                             = 0x00008000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR                                             = 0x00010000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COPY_BIT_KHR                                                             = 0x100000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR                                                  = 0x200000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_BLIT_BIT_KHR                                                             = 0x400000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR                                                            = 0x800000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR                                              = 0x1000000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR                           = 0x2000000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR                        = 0x4000000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR                                             = 0x04000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR                                             = 0x08000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT                                       = 0x01000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT                            = 0x00040000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV                                        = 0x00020000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR = 0x00400000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV                                        = 0x00400000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR             = 0x02000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR                                       = 0x00200000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_NV                                        = 0x00200000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_NV              = 0x02000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_FRAGMENT_DENSITY_PROCESS_BIT_EXT                 = 0x00800000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV                                                       = 0x00080000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV                                                       = 0x00100000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI                                       = 0x8000000000ULL;
 -static const VkPipelineStageFlagBits2KHR VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI                                       = 0x10000000000ULL;
 -
 -typedef deUint64 VkAccessFlags2KHR;
 -typedef deUint64 VkAccessFlagBits2KHR;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_NONE_KHR                                                                                = 0ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR                                   = 0x00000001ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_INDEX_READ_BIT_KHR                                                      = 0x00000002ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR                                   = 0x00000004ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_UNIFORM_READ_BIT_KHR                                                    = 0x00000008ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR                                   = 0x00000010ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_READ_BIT_KHR                                                     = 0x00000020ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_WRITE_BIT_KHR                                                    = 0x00000040ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR                                   = 0x00000080ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR                          = 0x00000100ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR                   = 0x00000200ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR          = 0x00000400ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFER_READ_BIT_KHR                                                   = 0x00000800ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR                                          = 0x00001000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_HOST_READ_BIT_KHR                                                               = 0x00002000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_HOST_WRITE_BIT_KHR                                                      = 0x00004000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_MEMORY_READ_BIT_KHR                                                     = 0x00008000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_MEMORY_WRITE_BIT_KHR                                                    = 0x00010000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR                                     = 0x100000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR                                     = 0x200000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR                                    = 0x400000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR                                               = 0x800000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR                                      = 0x1000000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR                                               = 0x2000000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR                                      = 0x4000000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT                                = 0x02000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT         = 0x04000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT                = 0x08000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT                      = 0x00100000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV                          = 0x00020000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV                         = 0x00040000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR   = 0x00800000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV                          = 0x00800000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR                     = 0x00200000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR                    = 0x00400000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_NV                      = 0x00200000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_NV                     = 0x00400000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT                               = 0x01000000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT               = 0x00080000ULL;
 -static const VkAccessFlagBits2KHR VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI                         = 0x8000000000ULL;
 -
 -VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                               void*);
 -VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                   deUintptr);
 -VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                         deUint32);
 -VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                     void*);
 -VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                    deUintptr);
 -VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                          deUint32);
 -VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                    void*);
 -VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                    void*);
 -VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                     void*);
 -VK_DEFINE_PLATFORM_TYPE(MirSurfacePtr,                                void*);
 -VK_DEFINE_PLATFORM_TYPE(AndroidNativeWindowPtr,               void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32InstanceHandle,          void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32WindowHandle,                    void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32Handle,                          void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32SecurityAttributesPtr,   const void*);
 -VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr,     void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                   void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                         const void*);
 -VK_DEFINE_PLATFORM_TYPE(RROutput,                                     void*);
 -VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                          deUint32);
 -VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                                deInt32);
 -VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,          deInt32);
 -VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                         void*);
 +typedef uint64_t VkPipelineStageFlags2;
 +
 +typedef uint64_t VkPipelineStageFlagBits2;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE                                                                                = 0ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_NONE_KHR                                                                    = 0ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT                                                     = 0x00000001ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR                                         = 0x00000001ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT                                                   = 0x00000002ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT_KHR                                               = 0x00000002ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT                                                    = 0x00000004ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR                                                = 0x00000004ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT                                                   = 0x00000008ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT_KHR                                               = 0x00000008ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT                     = 0x00000010ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_CONTROL_SHADER_BIT_KHR         = 0x00000010ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT          = 0x00000020ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TESSELLATION_EVALUATION_SHADER_BIT_KHR      = 0x00000020ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT                                         = 0x00000040ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_GEOMETRY_SHADER_BIT_KHR                                     = 0x00000040ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT                                         = 0x00000080ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR                                     = 0x00000080ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT                                    = 0x00000100ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT_KHR                                = 0x00000100ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT                                     = 0x00000200ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT_KHR                         = 0x00000200ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT                         = 0x00000400ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT_KHR                     = 0x00000400ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT                                          = 0x00000800ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT_KHR                                      = 0x00000800ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT                                                    = 0x00001000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR                                                = 0x00001000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT                                                                = 0x00001000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR                                                    = 0x00001000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT                                          = 0x00002000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR                                      = 0x00002000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT                                                                    = 0x00004000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_HOST_BIT_KHR                                                                = 0x00004000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT                                                    = 0x00008000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR                                                = 0x00008000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT                                                    = 0x00010000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR                                                = 0x00010000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT                                                                    = 0x100000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COPY_BIT_KHR                                                                = 0x100000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT                                                         = 0x200000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR                                                     = 0x200000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT                                                                    = 0x400000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_BLIT_BIT_KHR                                                                = 0x400000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT                                                                   = 0x800000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR                                                               = 0x800000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT                                                     = 0x1000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR                                         = 0x1000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT                          = 0x2000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR                      = 0x2000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT                               = 0x4000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR                   = 0x4000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_DECODE_BIT_KHR                                                = 0x04000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_VIDEO_ENCODE_BIT_KHR                                                = 0x08000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT                          = 0x01000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_CONDITIONAL_RENDERING_BIT_EXT                               = 0x00040000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_COMMAND_PREPROCESS_BIT_NV                                   = 0x00020000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR    = 0x00400000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SHADING_RATE_IMAGE_BIT_NV                                   = 0x00400000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR                = 0x02000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR                          = 0x00200000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_NV                                   = 0x00200000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_NV         = 0x02000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_FRAGMENT_DENSITY_PROCESS_BIT_EXT                    = 0x00800000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_NV                                          = 0x00080000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_NV                                          = 0x00100000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_SUBPASS_SHADING_BIT_HUAWEI                          = 0x8000000000ULL;
 +static const VkPipelineStageFlagBits2 VK_PIPELINE_STAGE_2_INVOCATION_MASK_BIT_HUAWEI                          = 0x10000000000ULL;
 +
 +
 +typedef uint64_t VkAccessFlags2;
 +
 +typedef uint64_t VkAccessFlagBits2;
 +static const VkAccessFlagBits2 VK_ACCESS_2_NONE                                                                                               = 0ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_NONE_KHR                                                                                   = 0ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT                                          = 0x00000001ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR                                      = 0x00000001ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT                                                                     = 0x00000002ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INDEX_READ_BIT_KHR                                                         = 0x00000002ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT                                          = 0x00000004ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT_KHR                                      = 0x00000004ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT                                                                   = 0x00000008ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_UNIFORM_READ_BIT_KHR                                                               = 0x00000008ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT                                          = 0x00000010ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT_KHR                                      = 0x00000010ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT                                                                    = 0x00000020ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_READ_BIT_KHR                                                                = 0x00000020ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT                                                                   = 0x00000040ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_WRITE_BIT_KHR                                                               = 0x00000040ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT                                          = 0x00000080ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT_KHR                                      = 0x00000080ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT                                         = 0x00000100ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT_KHR                                     = 0x00000100ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT                          = 0x00000200ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT_KHR                      = 0x00000200ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT                         = 0x00000400ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT_KHR                     = 0x00000400ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT                                                          = 0x00000800ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_READ_BIT_KHR                                                      = 0x00000800ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT                                                         = 0x00001000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR                                                     = 0x00001000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT                                                                      = 0x00002000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_READ_BIT_KHR                                                          = 0x00002000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT                                                                     = 0x00004000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_HOST_WRITE_BIT_KHR                                                         = 0x00004000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT                                                                    = 0x00008000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_READ_BIT_KHR                                                                = 0x00008000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT                                                                   = 0x00010000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_MEMORY_WRITE_BIT_KHR                                                               = 0x00010000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT                                                    = 0x100000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR                                                = 0x100000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT                                                    = 0x200000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR                                                = 0x200000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT                                                   = 0x400000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR                                               = 0x400000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_READ_BIT_KHR                                          = 0x800000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_DECODE_WRITE_BIT_KHR                                         = 0x1000000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_READ_BIT_KHR                                          = 0x2000000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_VIDEO_ENCODE_WRITE_BIT_KHR                                         = 0x4000000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT                                   = 0x02000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT                    = 0x04000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT                   = 0x08000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_CONDITIONAL_RENDERING_READ_BIT_EXT                         = 0x00100000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_READ_BIT_NV                                     = 0x00020000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COMMAND_PREPROCESS_WRITE_BIT_NV                                    = 0x00040000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR      = 0x00800000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_SHADING_RATE_IMAGE_READ_BIT_NV                                     = 0x00800000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR                                = 0x00200000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_KHR                               = 0x00400000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_NV                         = 0x00200000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_ACCELERATION_STRUCTURE_WRITE_BIT_NV                                = 0x00400000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT                          = 0x01000000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT          = 0x00080000ULL;
 +static const VkAccessFlagBits2 VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI                                    = 0x8000000000ULL;
 +
 +
 +typedef uint64_t VkFormatFeatureFlags2;
 +
 +typedef uint64_t VkFormatFeatureFlagBits2;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT                                                                                                                                   = 0x00000001ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR                                                                                                                               = 0x00000001ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT                                                                                                                                   = 0x00000002ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR                                                                                                                               = 0x00000002ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT                                                                                                                    = 0x00000004ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR                                                                                                                = 0x00000004ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT                                                                                                                    = 0x00000008ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR                                                                                                                = 0x00000008ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT                                                                                                                    = 0x00000010ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR                                                                                                                = 0x00000010ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT                                                                                                     = 0x00000020ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR                                                                                         = 0x00000020ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT                                                                                                                                   = 0x00000040ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR                                                                                                                               = 0x00000040ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT                                                                                                                                = 0x00000080ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR                                                                                                                    = 0x00000080ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT                                                                                                          = 0x00000100ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR                                                                                                      = 0x00000100ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT                                                                                                                = 0x00000200ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR                                                                                                    = 0x00000200ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT                                                                                                                                                = 0x00000400ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR                                                                                                                                    = 0x00000400ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT                                                                                                                                                = 0x00000800ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR                                                                                                                                    = 0x00000800ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT                                                                                                     = 0x00001000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR                                                                                         = 0x00001000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT                                                                                                      = 0x00002000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT                                                                                          = 0x00002000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT                                                                                                                                    = 0x00004000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR                                                                                                                                = 0x00004000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT                                                                                                                                    = 0x00008000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR                                                                                                                                = 0x00008000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT                                                                                                     = 0x00010000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR                                                                                         = 0x00010000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT                                                                                                         = 0x00020000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR                                                                                                     = 0x00020000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT                                                                    = 0x00040000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR                                                                = 0x00040000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT                                   = 0x00080000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR                               = 0x00080000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT                                   = 0x00100000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR                               = 0x00100000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT         = 0x00200000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR     = 0x00200000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT                                                                                                                                                = 0x00400000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR                                                                                                                                    = 0x00400000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT                                                                                                          = 0x00800000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR                                                                                                      = 0x00800000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT                                                                                                     = 0x80000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR                                                                                         = 0x80000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT                                                                                                    = 0x100000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR                                                                                                = 0x100000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT                                                                                          = 0x200000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR                                                                                      = 0x200000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR                                                                                                         = 0x02000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR                                                                                                                    = 0x04000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR                                                                                = 0x20000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT                                                                                                                = 0x01000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR                                                                                    = 0x40000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR                                                                                                          = 0x08000000ULL;
 +static const VkFormatFeatureFlagBits2 VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR                                                                                                                    = 0x10000000ULL;
 +
 +
 +typedef VkPipelineStageFlags2 VkPipelineStageFlags2KHR;
 +
 +typedef VkPipelineStageFlagBits2 VkPipelineStageFlagBits2KHR;
 +
 +typedef VkAccessFlags2 VkAccessFlags2KHR;
 +
 +typedef VkAccessFlagBits2 VkAccessFlagBits2KHR;
 +
 +typedef VkFormatFeatureFlags2 VkFormatFeatureFlags2KHR;
 +
 +typedef VkFormatFeatureFlagBits2 VkFormatFeatureFlagBits2KHR;
 +
 +VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                               void*)
 +VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                   uintptr_t)
 +VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                         uint32_t)
 +VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                     void*)
 +VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                    uintptr_t)
 +VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                          uint32_t)
 +VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                    void*)
 +VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                    void*)
 +VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                     void*)
 +VK_DEFINE_PLATFORM_TYPE(MirSurfacePtr,                                void*)
 +VK_DEFINE_PLATFORM_TYPE(AndroidNativeWindowPtr,               void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32InstanceHandle,          void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32WindowHandle,                    void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32Handle,                          void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32SecurityAttributesPtr,   const void*)
 +VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr,     void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                   void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                         const void*)
 +VK_DEFINE_PLATFORM_TYPE(RROutput,                                     void*)
- VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                          int32_t)
++VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                          uint32_t)
 +VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                                int32_t)
 +VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,          int32_t)
 +VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                         void*)
  #define VK_KHR_SURFACE_SPEC_VERSION 25
  #define VK_KHR_SWAPCHAIN_SPEC_VERSION 70
  #define VK_KHR_DISPLAY_SPEC_VERSION 23
diff --cc external/vulkancts/framework/vulkan/vkVulkan_c.inl
index 5258cc5,f0bc5dd..791e03d
--- 1/external/vulkancts/framework/vulkan/vkVulkan_c.inl
--- 2/external/vulkancts/framework/vulkan/vkVulkan_c.inl
+++ b/external/vulkancts/framework/vulkan/vkVulkan_c.inl
@@@ -6310,6 -6189,9 +6310,9 @@@ typedef enum VkDriverId 
      VK_DRIVER_ID_COREAVI_PROPRIETARY = 15,
      VK_DRIVER_ID_JUICE_PROPRIETARY = 16,
      VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17,
 -      VK_DRIVER_ID_MESA_TURNIP = 18,
 -      VK_DRIVER_ID_MESA_V3DV = 19,
 -      VK_DRIVER_ID_MESA_PANVK = 20,
++    VK_DRIVER_ID_MESA_TURNIP = 18,
++    VK_DRIVER_ID_MESA_V3DV = 19,
++    VK_DRIVER_ID_MESA_PANVK = 20,
      VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY,
      VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE,
      VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV,
diff --cc external/vulkancts/scripts/gen_framework.py
index fe476dd,d27fe72..0e431d1
--- 1/external/vulkancts/scripts/gen_framework.py
--- 2/external/vulkancts/scripts/gen_framework.py
+++ b/external/vulkancts/scripts/gen_framework.py
@@@ -97,9 -97,9 +97,9 @@@ PLATFORM_TYPES                = 
        # VK_EXT_acquire_xlib_display
        (["RROutput"],                                                  ["RROutput"],                                   "void*"),
  
-       (["zx_handle_t"],                                               ["zx_handle_t"],                                "int32_t"),
 -      (["zx_handle_t"],                                               ["zx_handle_t"],                                "deUint32"),
 -      (["GgpFrameToken"],                                             ["GgpFrameToken"],                              "deInt32"),
 -      (["GgpStreamDescriptor"],                               ["GgpStreamDescriptor"],                "deInt32"),
++      (["zx_handle_t"],                                               ["zx_handle_t"],                                "uint32_t"),
 +      (["GgpFrameToken"],                                             ["GgpFrameToken"],                              "int32_t"),
 +      (["GgpStreamDescriptor"],                               ["GgpStreamDescriptor"],                "int32_t"),
        (["CAMetalLayer"],                                              ["CAMetalLayer"],                               "void*"),
  ]
  
diff --cc external/vulkancts/scripts/src/vulkan_core.h
index 6a9318b,3ea8a1d..8d7805d
--- 1/external/vulkancts/scripts/src/vulkan_core.h
--- 2/external/vulkancts/scripts/src/vulkan_core.h
+++ b/external/vulkancts/scripts/src/vulkan_core.h
@@@ -5406,6 -5285,9 +5406,9 @@@ typedef enum VkDriverId 
      VK_DRIVER_ID_COREAVI_PROPRIETARY = 15,
      VK_DRIVER_ID_JUICE_PROPRIETARY = 16,
      VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17,
 -      VK_DRIVER_ID_MESA_TURNIP = 18,
 -      VK_DRIVER_ID_MESA_V3DV = 19,
 -      VK_DRIVER_ID_MESA_PANVK = 20,
++    VK_DRIVER_ID_MESA_TURNIP = 18,
++    VK_DRIVER_ID_MESA_V3DV = 19,
++    VK_DRIVER_ID_MESA_PANVK = 20,
      VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY,
      VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE,
      VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV,
Domain: Graphics System / GL;