Merge Mesa 18.3.2

6 files changed, 666 insertions, 166 deletions

diff --git a/lib/mesa/src/vulkan/util/gen_enum_to_str.py b/lib/mesa/src/vulkan/util/gen_enum_to_str.py
index b19d6de9f..fb9ecd65c 100644
--- a/lib/mesa/src/vulkan/util/gen_enum_to_str.py
+++ b/lib/mesa/src/vulkan/util/gen_enum_to_str.py
@@ -152,18 +152,40 @@ class VkEnum(object):
         self.name = name
         # Maps numbers to names
         self.values = values or dict()
+        self.name_to_value = dict()
 
     def add_value(self, name, value=None,
-                  extension=None, offset=None,
+                  extnum=None, offset=None,
                   error=False):
-        assert value is not None or extension is not None
+        assert value is not None or extnum is not None
         if value is None:
-            value = 1000000000 + (extension.number - 1) * 1000 + offset
+            value = 1000000000 + (extnum - 1) * 1000 + offset
             if error:
                 value = -value
 
+        self.name_to_value[name] = value
         if value not in self.values:
             self.values[value] = name
+        elif len(self.values[value]) > len(name):
+            self.values[value] = name
+
+    def add_value_from_xml(self, elem, extension=None):
+        if 'value' in elem.attrib:
+            self.add_value(elem.attrib['name'],
+                           value=int(elem.attrib['value'], base=0))
+        elif 'alias' in elem.attrib:
+            self.add_value(elem.attrib['name'],
+                           value=self.name_to_value[elem.attrib['alias']])
+        else:
+            error = 'dir' in elem.attrib and elem.attrib['dir'] == '-'
+            if 'extnumber' in elem.attrib:
+                extnum = int(elem.attrib['extnumber'])
+            else:
+                extnum = extension.number
+            self.add_value(elem.attrib['name'],
+                           extnum=extnum,
+                           offset=int(elem.attrib['offset']),
+                           error=error)
 
 
 def parse_xml(enum_factory, ext_factory, filename):
@@ -178,8 +200,12 @@ def parse_xml(enum_factory, ext_factory, filename):
     for enum_type in xml.findall('./enums[@type="enum"]'):
         enum = enum_factory(enum_type.attrib['name'])
         for value in enum_type.findall('./enum'):
-            enum.add_value(value.attrib['name'],
-                           value=int(value.attrib['value']))
+            enum.add_value_from_xml(value)
+
+    for value in xml.findall('./feature/require/enum[@extends]'):
+        enum = enum_factory.get(value.attrib['extends'])
+        if enum is not None:
+            enum.add_value_from_xml(value)
 
     for ext_elem in xml.findall('./extensions/extension[@supported="vulkan"]'):
         extension = ext_factory(ext_elem.attrib['name'],
@@ -187,17 +213,8 @@ def parse_xml(enum_factory, ext_factory, filename):
 
         for value in ext_elem.findall('./require/enum[@extends]'):
             enum = enum_factory.get(value.attrib['extends'])
-            if enum is None:
-                continue
-            if 'value' in value.attrib:
-                enum.add_value(value.attrib['name'],
-                               value=int(value.attrib['value']))
-            else:
-                error = 'dir' in value.attrib and value.attrib['dir'] == '-'
-                enum.add_value(value.attrib['name'],
-                               extension=extension,
-                               offset=int(value.attrib['offset']),
-                               error=error)
+            if enum is not None:
+                enum.add_value_from_xml(value, extension)
 
 
 def main():
diff --git a/lib/mesa/src/vulkan/util/vk_alloc.h b/lib/mesa/src/vulkan/util/vk_alloc.h
index f58a80625..2e807a96d 100644
--- a/lib/mesa/src/vulkan/util/vk_alloc.h
+++ b/lib/mesa/src/vulkan/util/vk_alloc.h
@@ -67,6 +67,23 @@ vk_free(const VkAllocationCallbacks *alloc, void *data)
    alloc->pfnFree(alloc->pUserData, data);
 }
 
+static inline char *
+vk_strdup(const VkAllocationCallbacks *alloc, const char *s,
+          VkSystemAllocationScope scope)
+{
+   if (s == NULL)
+      return NULL;
+
+   size_t size = strlen(s) + 1;
+   char *copy = vk_alloc(alloc, size, 1, scope);
+   if (copy == NULL)
+      return NULL;
+
+   memcpy(copy, s, size);
+
+   return copy;
+}
+
 static inline void *
 vk_alloc2(const VkAllocationCallbacks *parent_alloc,
           const VkAllocationCallbacks *alloc,
diff --git a/lib/mesa/src/vulkan/util/vk_enum_to_str.c b/lib/mesa/src/vulkan/util/vk_enum_to_str.c
index 09387455c..6e08209f2 100644
--- a/lib/mesa/src/vulkan/util/vk_enum_to_str.c
+++ b/lib/mesa/src/vulkan/util/vk_enum_to_str.c
@@ -29,6 +29,19 @@
 
 
 const char *
+vk_AccelerationStructureTypeNVX_to_str(VkAccelerationStructureTypeNVX input)
+{
+    switch(input) {
+        case 0:
+            return "VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_NVX";
+        case 1:
+            return "VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_NVX";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_AttachmentLoadOp_to_str(VkAttachmentLoadOp input)
 {
     switch(input) {
@@ -251,13 +264,30 @@ vk_BorderColor_to_str(VkBorderColor input)
 }
 
 const char *
-vk_ChromaLocationKHR_to_str(VkChromaLocationKHR input)
+vk_ChromaLocation_to_str(VkChromaLocation input)
 {
     switch(input) {
         case 0:
-            return "VK_CHROMA_LOCATION_COSITED_EVEN_KHR";
+            return "VK_CHROMA_LOCATION_COSITED_EVEN";
         case 1:
-            return "VK_CHROMA_LOCATION_MIDPOINT_KHR";
+            return "VK_CHROMA_LOCATION_MIDPOINT";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_CoarseSampleOrderTypeNV_to_str(VkCoarseSampleOrderTypeNV input)
+{
+    switch(input) {
+        case 0:
+            return "VK_COARSE_SAMPLE_ORDER_TYPE_DEFAULT_NV";
+        case 1:
+            return "VK_COARSE_SAMPLE_ORDER_TYPE_CUSTOM_NV";
+        case 2:
+            return "VK_COARSE_SAMPLE_ORDER_TYPE_PIXEL_MAJOR_NV";
+        case 3:
+            return "VK_COARSE_SAMPLE_ORDER_TYPE_SAMPLE_MAJOR_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -268,7 +298,7 @@ vk_ColorSpaceKHR_to_str(VkColorSpaceKHR input)
 {
     switch(input) {
         case 0:
-            return "VK_COLOR_SPACE_SRGB_NONLINEAR_KHR";
+            return "VK_COLORSPACE_SRGB_NONLINEAR_KHR";
         case 1000104001:
             return "VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT";
         case 1000104002:
@@ -364,6 +394,34 @@ vk_ComponentSwizzle_to_str(VkComponentSwizzle input)
 }
 
 const char *
+vk_ConservativeRasterizationModeEXT_to_str(VkConservativeRasterizationModeEXT input)
+{
+    switch(input) {
+        case 0:
+            return "VK_CONSERVATIVE_RASTERIZATION_MODE_DISABLED_EXT";
+        case 1:
+            return "VK_CONSERVATIVE_RASTERIZATION_MODE_OVERESTIMATE_EXT";
+        case 2:
+            return "VK_CONSERVATIVE_RASTERIZATION_MODE_UNDERESTIMATE_EXT";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_CopyAccelerationStructureModeNVX_to_str(VkCopyAccelerationStructureModeNVX input)
+{
+    switch(input) {
+        case 0:
+            return "VK_COPY_ACCELERATION_STRUCTURE_MODE_CLONE_NVX";
+        case 1:
+            return "VK_COPY_ACCELERATION_STRUCTURE_MODE_COMPACT_NVX";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_CoverageModulationModeNV_to_str(VkCoverageModulationModeNV input)
 {
     switch(input) {
@@ -441,7 +499,7 @@ vk_DebugReportObjectTypeEXT_to_str(VkDebugReportObjectTypeEXT input)
         case 27:
             return "VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT";
         case 28:
-            return "VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT";
+            return "VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT";
         case 29:
             return "VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT";
         case 30:
@@ -453,9 +511,11 @@ vk_DebugReportObjectTypeEXT_to_str(VkDebugReportObjectTypeEXT input)
         case 33:
             return "VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT";
         case 1000085000:
-            return "VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT";
+            return "VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT";
         case 1000156000:
-            return "VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR_EXT";
+            return "VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT";
+        case 1000165000:
+            return "VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NVX_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -487,17 +547,21 @@ vk_DescriptorType_to_str(VkDescriptorType input)
             return "VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC";
         case 10:
             return "VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT";
+        case 1000138000:
+            return "VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT";
+        case 1000165000:
+            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NVX";
     default:
         unreachable("Undefined enum value.");
     }
 }
 
 const char *
-vk_DescriptorUpdateTemplateTypeKHR_to_str(VkDescriptorUpdateTemplateTypeKHR input)
+vk_DescriptorUpdateTemplateType_to_str(VkDescriptorUpdateTemplateType input)
 {
     switch(input) {
         case 0:
-            return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET_KHR";
+            return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET";
         case 1:
             return "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR";
     default:
@@ -556,6 +620,33 @@ vk_DisplayPowerStateEXT_to_str(VkDisplayPowerStateEXT input)
 }
 
 const char *
+vk_DriverIdKHR_to_str(VkDriverIdKHR input)
+{
+    switch(input) {
+        case 1:
+            return "VK_DRIVER_ID_AMD_PROPRIETARY_KHR";
+        case 2:
+            return "VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR";
+        case 3:
+            return "VK_DRIVER_ID_MESA_RADV_KHR";
+        case 4:
+            return "VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR";
+        case 5:
+            return "VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS_KHR";
+        case 6:
+            return "VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR";
+        case 7:
+            return "VK_DRIVER_ID_IMAGINATION_PROPRIETARY_KHR";
+        case 8:
+            return "VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR";
+        case 9:
+            return "VK_DRIVER_ID_ARM_PROPRIETARY_KHR";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_DynamicState_to_str(VkDynamicState input)
 {
     switch(input) {
@@ -583,6 +674,12 @@ vk_DynamicState_to_str(VkDynamicState input)
             return "VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT";
         case 1000143000:
             return "VK_DYNAMIC_STATE_SAMPLE_LOCATIONS_EXT";
+        case 1000164004:
+            return "VK_DYNAMIC_STATE_VIEWPORT_SHADING_RATE_PALETTE_NV";
+        case 1000164006:
+            return "VK_DYNAMIC_STATE_VIEWPORT_COARSE_SAMPLE_ORDER_NV";
+        case 1000205001:
+            return "VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -994,73 +1091,73 @@ vk_Format_to_str(VkFormat input)
         case 1000054007:
             return "VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG";
         case 1000156000:
-            return "VK_FORMAT_G8B8G8R8_422_UNORM_KHR";
+            return "VK_FORMAT_G8B8G8R8_422_UNORM";
         case 1000156001:
-            return "VK_FORMAT_B8G8R8G8_422_UNORM_KHR";
+            return "VK_FORMAT_B8G8R8G8_422_UNORM";
         case 1000156002:
-            return "VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM_KHR";
+            return "VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM";
         case 1000156003:
-            return "VK_FORMAT_G8_B8R8_2PLANE_420_UNORM_KHR";
+            return "VK_FORMAT_G8_B8R8_2PLANE_420_UNORM";
         case 1000156004:
-            return "VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM_KHR";
+            return "VK_FORMAT_G8_B8_R8_3PLANE_422_UNORM";
         case 1000156005:
-            return "VK_FORMAT_G8_B8R8_2PLANE_422_UNORM_KHR";
+            return "VK_FORMAT_G8_B8R8_2PLANE_422_UNORM";
         case 1000156006:
-            return "VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM_KHR";
+            return "VK_FORMAT_G8_B8_R8_3PLANE_444_UNORM";
         case 1000156007:
-            return "VK_FORMAT_R10X6_UNORM_PACK16_KHR";
+            return "VK_FORMAT_R10X6_UNORM_PACK16";
         case 1000156008:
-            return "VK_FORMAT_R10X6G10X6_UNORM_2PACK16_KHR";
+            return "VK_FORMAT_R10X6G10X6_UNORM_2PACK16";
         case 1000156009:
-            return "VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16_KHR";
+            return "VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16";
         case 1000156010:
-            return "VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16_KHR";
+            return "VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16";
         case 1000156011:
-            return "VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16_KHR";
+            return "VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16";
         case 1000156012:
-            return "VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16";
         case 1000156013:
-            return "VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16";
         case 1000156014:
-            return "VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_422_UNORM_3PACK16";
         case 1000156015:
-            return "VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G10X6_B10X6R10X6_2PLANE_422_UNORM_3PACK16";
         case 1000156016:
-            return "VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G10X6_B10X6_R10X6_3PLANE_444_UNORM_3PACK16";
         case 1000156017:
-            return "VK_FORMAT_R12X4_UNORM_PACK16_KHR";
+            return "VK_FORMAT_R12X4_UNORM_PACK16";
         case 1000156018:
-            return "VK_FORMAT_R12X4G12X4_UNORM_2PACK16_KHR";
+            return "VK_FORMAT_R12X4G12X4_UNORM_2PACK16";
         case 1000156019:
-            return "VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16_KHR";
+            return "VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16";
         case 1000156020:
-            return "VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16_KHR";
+            return "VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16";
         case 1000156021:
-            return "VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16_KHR";
+            return "VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16";
         case 1000156022:
-            return "VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16";
         case 1000156023:
-            return "VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16";
         case 1000156024:
-            return "VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_422_UNORM_3PACK16";
         case 1000156025:
-            return "VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16";
         case 1000156026:
-            return "VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16_KHR";
+            return "VK_FORMAT_G12X4_B12X4_R12X4_3PLANE_444_UNORM_3PACK16";
         case 1000156027:
-            return "VK_FORMAT_G16B16G16R16_422_UNORM_KHR";
+            return "VK_FORMAT_G16B16G16R16_422_UNORM";
         case 1000156028:
-            return "VK_FORMAT_B16G16R16G16_422_UNORM_KHR";
+            return "VK_FORMAT_B16G16R16G16_422_UNORM";
         case 1000156029:
-            return "VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM_KHR";
+            return "VK_FORMAT_G16_B16_R16_3PLANE_420_UNORM";
         case 1000156030:
-            return "VK_FORMAT_G16_B16R16_2PLANE_420_UNORM_KHR";
+            return "VK_FORMAT_G16_B16R16_2PLANE_420_UNORM";
         case 1000156031:
-            return "VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM_KHR";
+            return "VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM";
         case 1000156032:
-            return "VK_FORMAT_G16_B16R16_2PLANE_422_UNORM_KHR";
+            return "VK_FORMAT_G16_B16R16_2PLANE_422_UNORM";
         case 1000156033:
-            return "VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM_KHR";
+            return "VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1080,6 +1177,19 @@ vk_FrontFace_to_str(VkFrontFace input)
 }
 
 const char *
+vk_GeometryTypeNVX_to_str(VkGeometryTypeNVX input)
+{
+    switch(input) {
+        case 0:
+            return "VK_GEOMETRY_TYPE_TRIANGLES_NVX";
+        case 1:
+            return "VK_GEOMETRY_TYPE_AABBS_NVX";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_ImageLayout_to_str(VkImageLayout input)
 {
     switch(input) {
@@ -1106,9 +1216,11 @@ vk_ImageLayout_to_str(VkImageLayout input)
         case 1000111000:
             return "VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR";
         case 1000117000:
-            return "VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR";
+            return "VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL";
         case 1000117001:
-            return "VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR";
+            return "VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL";
+        case 1000164003:
+            return "VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1122,6 +1234,8 @@ vk_ImageTiling_to_str(VkImageTiling input)
             return "VK_IMAGE_TILING_OPTIMAL";
         case 1:
             return "VK_IMAGE_TILING_LINEAR";
+        case 1000158000:
+            return "VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1341,15 +1455,19 @@ vk_ObjectType_to_str(VkObjectType input)
         case 1000011000:
             return "VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT";
         case 1000085000:
-            return "VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR";
+            return "VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE";
         case 1000086000:
             return "VK_OBJECT_TYPE_OBJECT_TABLE_NVX";
         case 1000086001:
             return "VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX";
+        case 1000128000:
+            return "VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT";
         case 1000156000:
-            return "VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR";
+            return "VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION";
         case 1000160000:
             return "VK_OBJECT_TYPE_VALIDATION_CACHE_EXT";
+        case 1000165000:
+            return "VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NVX";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1382,6 +1500,8 @@ vk_PipelineBindPoint_to_str(VkPipelineBindPoint input)
             return "VK_PIPELINE_BIND_POINT_GRAPHICS";
         case 1:
             return "VK_PIPELINE_BIND_POINT_COMPUTE";
+        case 1000165000:
+            return "VK_PIPELINE_BIND_POINT_RAYTRACING_NVX";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1399,13 +1519,13 @@ vk_PipelineCacheHeaderVersion_to_str(VkPipelineCacheHeaderVersion input)
 }
 
 const char *
-vk_PointClippingBehaviorKHR_to_str(VkPointClippingBehaviorKHR input)
+vk_PointClippingBehavior_to_str(VkPointClippingBehavior input)
 {
     switch(input) {
         case 0:
-            return "VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES_KHR";
+            return "VK_POINT_CLIPPING_BEHAVIOR_ALL_CLIP_PLANES";
         case 1:
-            return "VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY_KHR";
+            return "VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1490,6 +1610,10 @@ vk_QueryType_to_str(VkQueryType input)
             return "VK_QUERY_TYPE_PIPELINE_STATISTICS";
         case 2:
             return "VK_QUERY_TYPE_TIMESTAMP";
+        case 1000028004:
+            return "VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT";
+        case 1000165000:
+            return "VK_QUERY_TYPE_COMPACTED_SIZE_NVX";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1500,13 +1624,13 @@ vk_QueueGlobalPriorityEXT_to_str(VkQueueGlobalPriorityEXT input)
 {
     switch(input) {
         case 128:
-            return "VK_QUEUE_GLOBAL_PRIORITY_LOW";
+            return "VK_QUEUE_GLOBAL_PRIORITY_LOW_EXT";
         case 256:
-            return "VK_QUEUE_GLOBAL_PRIORITY_MEDIUM";
+            return "VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT";
         case 512:
-            return "VK_QUEUE_GLOBAL_PRIORITY_HIGH";
+            return "VK_QUEUE_GLOBAL_PRIORITY_HIGH_EXT";
         case 1024:
-            return "VK_QUEUE_GLOBAL_PRIORITY_REALTIME";
+            return "VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1531,10 +1655,14 @@ vk_Result_to_str(VkResult input)
     switch(input) {
         case -1000174001:
             return "VK_ERROR_NOT_PERMITTED_EXT";
+        case -1000161000:
+            return "VK_ERROR_FRAGMENTATION_EXT";
+        case -1000158000:
+            return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
         case -1000072003:
-            return "VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR";
+            return "VK_ERROR_INVALID_EXTERNAL_HANDLE";
         case -1000069000:
-            return "VK_ERROR_OUT_OF_POOL_MEMORY_KHR";
+            return "VK_ERROR_OUT_OF_POOL_MEMORY";
         case -1000012000:
             return "VK_ERROR_INVALID_SHADER_NV";
         case -1000011001:
@@ -1638,32 +1766,80 @@ vk_SamplerReductionModeEXT_to_str(VkSamplerReductionModeEXT input)
 }
 
 const char *
-vk_SamplerYcbcrModelConversionKHR_to_str(VkSamplerYcbcrModelConversionKHR input)
+vk_SamplerYcbcrModelConversion_to_str(VkSamplerYcbcrModelConversion input)
 {
     switch(input) {
         case 0:
-            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY_KHR";
+            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY";
         case 1:
-            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY_KHR";
+            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_IDENTITY";
         case 2:
-            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709_KHR";
+            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709";
         case 3:
-            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601_KHR";
+            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601";
         case 4:
-            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020_KHR";
+            return "VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020";
     default:
         unreachable("Undefined enum value.");
     }
 }
 
 const char *
-vk_SamplerYcbcrRangeKHR_to_str(VkSamplerYcbcrRangeKHR input)
+vk_SamplerYcbcrRange_to_str(VkSamplerYcbcrRange input)
 {
     switch(input) {
         case 0:
-            return "VK_SAMPLER_YCBCR_RANGE_ITU_FULL_KHR";
+            return "VK_SAMPLER_YCBCR_RANGE_ITU_FULL";
         case 1:
-            return "VK_SAMPLER_YCBCR_RANGE_ITU_NARROW_KHR";
+            return "VK_SAMPLER_YCBCR_RANGE_ITU_NARROW";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_ShaderInfoTypeAMD_to_str(VkShaderInfoTypeAMD input)
+{
+    switch(input) {
+        case 0:
+            return "VK_SHADER_INFO_TYPE_STATISTICS_AMD";
+        case 1:
+            return "VK_SHADER_INFO_TYPE_BINARY_AMD";
+        case 2:
+            return "VK_SHADER_INFO_TYPE_DISASSEMBLY_AMD";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_ShadingRatePaletteEntryNV_to_str(VkShadingRatePaletteEntryNV input)
+{
+    switch(input) {
+        case 0:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_NO_INVOCATIONS_NV";
+        case 1:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_16_INVOCATIONS_PER_PIXEL_NV";
+        case 2:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_8_INVOCATIONS_PER_PIXEL_NV";
+        case 3:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_4_INVOCATIONS_PER_PIXEL_NV";
+        case 4:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_2_INVOCATIONS_PER_PIXEL_NV";
+        case 5:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_PIXEL_NV";
+        case 6:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_2X1_PIXELS_NV";
+        case 7:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_1X2_PIXELS_NV";
+        case 8:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_2X2_PIXELS_NV";
+        case 9:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_4X2_PIXELS_NV";
+        case 10:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_2X4_PIXELS_NV";
+        case 11:
+            return "VK_SHADING_RATE_PALETTE_ENTRY_1_INVOCATION_PER_4X4_PIXELS_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1831,15 +2007,8 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR";
         case 1000009000:
             return "VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR";
-
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wswitch"
-        case 1000010000:
-            return "VK_STRUCTURE_TYPE_NATIVE_BUFFER_ANDROID";
-        #pragma GCC diagnostic pop
-
         case 1000011000:
-            return "VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT";
+            return "VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT";
         case 1000018000:
             return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_RASTERIZATION_ORDER_AMD";
         case 1000022000:
@@ -1854,14 +2023,22 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_BUFFER_CREATE_INFO_NV";
         case 1000026002:
             return "VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV";
+        case 1000028000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT";
+        case 1000028001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT";
+        case 1000028002:
+            return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT";
         case 1000041000:
             return "VK_STRUCTURE_TYPE_TEXTURE_LOD_GATHER_FORMAT_PROPERTIES_AMD";
+        case 1000050000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CORNER_SAMPLED_IMAGE_FEATURES_NV";
         case 1000053000:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO";
         case 1000053001:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES_KHX";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES";
         case 1000053002:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES_KHX";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES";
         case 1000056000:
             return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_NV";
         case 1000056001:
@@ -1873,73 +2050,79 @@ vk_StructureType_to_str(VkStructureType input)
         case 1000058000:
             return "VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_NV";
         case 1000059000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2";
         case 1000059001:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2";
         case 1000059002:
-            return "VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2_KHR";
+            return "VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2";
         case 1000059003:
-            return "VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHR";
+            return "VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2";
         case 1000059004:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2";
         case 1000059005:
-            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2_KHR";
+            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_PROPERTIES_2";
         case 1000059006:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2";
         case 1000059007:
-            return "VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2_KHR";
+            return "VK_STRUCTURE_TYPE_SPARSE_IMAGE_FORMAT_PROPERTIES_2";
         case 1000059008:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SPARSE_IMAGE_FORMAT_INFO_2";
         case 1000060000:
-            return "VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO";
         case 1000060003:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_RENDER_PASS_BEGIN_INFO";
         case 1000060004:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_COMMAND_BUFFER_BEGIN_INFO";
         case 1000060005:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO";
         case 1000060006:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_BIND_SPARSE_INFO";
         case 1000060007:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR";
         case 1000060008:
-            return "VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_IMAGE_SWAPCHAIN_CREATE_INFO_KHR";
         case 1000060009:
-            return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR";
         case 1000060010:
-            return "VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_ACQUIRE_NEXT_IMAGE_INFO_KHR";
         case 1000060011:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_INFO_KHR";
         case 1000060012:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_SWAPCHAIN_CREATE_INFO_KHR";
         case 1000060013:
-            return "VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_DEVICE_GROUP_INFO";
         case 1000060014:
-            return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO";
         case 1000061000:
             return "VK_STRUCTURE_TYPE_VALIDATION_FLAGS_EXT";
         case 1000062000:
             return "VK_STRUCTURE_TYPE_VI_SURFACE_CREATE_INFO_NN";
+        case 1000063000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES";
+        case 1000067000:
+            return "VK_STRUCTURE_TYPE_IMAGE_VIEW_ASTC_DECODE_MODE_EXT";
+        case 1000067001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ASTC_DECODE_FEATURES_EXT";
         case 1000070000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES_KHX";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES";
         case 1000070001:
-            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO_KHX";
+            return "VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO";
         case 1000071000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO";
         case 1000071001:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES";
         case 1000071002:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO";
         case 1000071003:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES";
         case 1000071004:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES";
         case 1000072000:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO";
         case 1000072001:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO";
         case 1000072002:
-            return "VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO";
         case 1000073000:
             return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR";
         case 1000073001:
@@ -1957,11 +2140,11 @@ vk_StructureType_to_str(VkStructureType input)
         case 1000075000:
             return "VK_STRUCTURE_TYPE_WIN32_KEYED_MUTEX_ACQUIRE_RELEASE_INFO_KHR";
         case 1000076000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO";
         case 1000076001:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES";
         case 1000077000:
-            return "VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO";
         case 1000078000:
             return "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR";
         case 1000078001:
@@ -1976,12 +2159,18 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR";
         case 1000080000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR";
+        case 1000081000:
+            return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT";
+        case 1000081001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT";
+        case 1000081002:
+            return "VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT";
         case 1000083000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES";
         case 1000084000:
             return "VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR";
         case 1000085000:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO";
         case 1000086000:
             return "VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX";
         case 1000086001:
@@ -1997,7 +2186,7 @@ vk_StructureType_to_str(VkStructureType input)
         case 1000087000:
             return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_W_SCALING_STATE_CREATE_INFO_NV";
         case 1000090000:
-            return "VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_EXT";
+            return "VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES2_EXT";
         case 1000091000:
             return "VK_STRUCTURE_TYPE_DISPLAY_POWER_INFO_EXT";
         case 1000091001:
@@ -2008,6 +2197,8 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT";
         case 1000092000:
             return "VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE";
+        case 1000094000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES";
         case 1000097000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX";
         case 1000098000:
@@ -2016,16 +2207,34 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT";
         case 1000099001:
             return "VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT";
+        case 1000101000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT";
+        case 1000101001:
+            return "VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_CONSERVATIVE_STATE_CREATE_INFO_EXT";
         case 1000105000:
             return "VK_STRUCTURE_TYPE_HDR_METADATA_EXT";
+        case 1000109000:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION_2_KHR";
+        case 1000109001:
+            return "VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR";
+        case 1000109002:
+            return "VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR";
+        case 1000109003:
+            return "VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR";
+        case 1000109004:
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR";
+        case 1000109005:
+            return "VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR";
+        case 1000109006:
+            return "VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR";
         case 1000111000:
             return "VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR";
         case 1000112000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO";
         case 1000112001:
-            return "VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_EXTERNAL_FENCE_PROPERTIES";
         case 1000113000:
-            return "VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO";
         case 1000114000:
             return "VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR";
         case 1000114001:
@@ -2037,13 +2246,13 @@ vk_StructureType_to_str(VkStructureType input)
         case 1000115001:
             return "VK_STRUCTURE_TYPE_FENCE_GET_FD_INFO_KHR";
         case 1000117000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES";
         case 1000117001:
-            return "VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO";
         case 1000117002:
-            return "VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO";
         case 1000117003:
-            return "VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO";
         case 1000119000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR";
         case 1000119001:
@@ -2051,19 +2260,59 @@ vk_StructureType_to_str(VkStructureType input)
         case 1000119002:
             return "VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR";
         case 1000120000:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES";
+        case 1000121000:
+            return "VK_STRUCTURE_TYPE_DISPLAY_PROPERTIES_2_KHR";
+        case 1000121001:
+            return "VK_STRUCTURE_TYPE_DISPLAY_PLANE_PROPERTIES_2_KHR";
+        case 1000121002:
+            return "VK_STRUCTURE_TYPE_DISPLAY_MODE_PROPERTIES_2_KHR";
+        case 1000121003:
+            return "VK_STRUCTURE_TYPE_DISPLAY_PLANE_INFO_2_KHR";
+        case 1000121004:
+            return "VK_STRUCTURE_TYPE_DISPLAY_PLANE_CAPABILITIES_2_KHR";
         case 1000122000:
             return "VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK";
         case 1000123000:
             return "VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK";
         case 1000127000:
-            return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR";
+            return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS";
         case 1000127001:
-            return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO";
+        case 1000128000:
+            return "VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT";
+        case 1000128001:
+            return "VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT";
+        case 1000128002:
+            return "VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT";
+        case 1000128003:
+            return "VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CALLBACK_DATA_EXT";
+        case 1000128004:
+            return "VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT";
+        case 1000129000:
+            return "VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_USAGE_ANDROID";
+        case 1000129001:
+            return "VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID";
+        case 1000129002:
+            return "VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID";
+        case 1000129003:
+            return "VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID";
+        case 1000129004:
+            return "VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID";
+        case 1000129005:
+            return "VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID";
         case 1000130000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_FILTER_MINMAX_PROPERTIES_EXT";
         case 1000130001:
             return "VK_STRUCTURE_TYPE_SAMPLER_REDUCTION_MODE_CREATE_INFO_EXT";
+        case 1000138000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_FEATURES_EXT";
+        case 1000138001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INLINE_UNIFORM_BLOCK_PROPERTIES_EXT";
+        case 1000138002:
+            return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT";
+        case 1000138003:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO_EXT";
         case 1000143000:
             return "VK_STRUCTURE_TYPE_SAMPLE_LOCATIONS_INFO_EXT";
         case 1000143001:
@@ -2074,16 +2323,24 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT";
         case 1000143004:
             return "VK_STRUCTURE_TYPE_MULTISAMPLE_PROPERTIES_EXT";
+        case 1000145000:
+            return "VK_STRUCTURE_TYPE_PROTECTED_SUBMIT_INFO";
+        case 1000145001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES";
+        case 1000145002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_PROPERTIES";
+        case 1000145003:
+            return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2";
         case 1000146000:
-            return "VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR";
+            return "VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2";
         case 1000146001:
-            return "VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR";
+            return "VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2";
         case 1000146002:
-            return "VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2_KHR";
+            return "VK_STRUCTURE_TYPE_IMAGE_SPARSE_MEMORY_REQUIREMENTS_INFO_2";
         case 1000146003:
-            return "VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR";
+            return "VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2";
         case 1000146004:
-            return "VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2_KHR";
+            return "VK_STRUCTURE_TYPE_SPARSE_IMAGE_MEMORY_REQUIREMENTS_2";
         case 1000147000:
             return "VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR";
         case 1000148000:
@@ -2097,27 +2354,133 @@ vk_StructureType_to_str(VkStructureType input)
         case 1000152000:
             return "VK_STRUCTURE_TYPE_PIPELINE_COVERAGE_MODULATION_STATE_CREATE_INFO_NV";
         case 1000156000:
-            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO";
         case 1000156001:
-            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO";
         case 1000156002:
-            return "VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO";
         case 1000156003:
-            return "VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO";
         case 1000156004:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES";
         case 1000156005:
-            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES_KHR";
+            return "VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_IMAGE_FORMAT_PROPERTIES";
         case 1000157000:
-            return "VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO";
         case 1000157001:
-            return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR";
+            return "VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO";
+        case 1000158000:
+            return "VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT";
+        case 1000158001:
+            return "VK_STRUCTURE_TYPE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT";
+        case 1000158002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT";
+        case 1000158003:
+            return "VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT";
+        case 1000158004:
+            return "VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT";
+        case 1000158005:
+            return "VK_STRUCTURE_TYPE_IMAGE_DRM_FORMAT_MODIFIER_PROPERTIES_EXT";
         case 1000160000:
             return "VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT";
         case 1000160001:
             return "VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT";
+        case 1000161000:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT";
+        case 1000161001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT";
+        case 1000161002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT";
+        case 1000161003:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT";
+        case 1000161004:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT";
+        case 1000164000:
+            return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SHADING_RATE_IMAGE_STATE_CREATE_INFO_NV";
+        case 1000164001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV";
+        case 1000164002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_PROPERTIES_NV";
+        case 1000164005:
+            return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_COARSE_SAMPLE_ORDER_STATE_CREATE_INFO_NV";
+        case 1000165000:
+            return "VK_STRUCTURE_TYPE_RAYTRACING_PIPELINE_CREATE_INFO_NVX";
+        case 1000165001:
+            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NVX";
+        case 1000165002:
+            return "VK_STRUCTURE_TYPE_GEOMETRY_INSTANCE_NVX";
+        case 1000165003:
+            return "VK_STRUCTURE_TYPE_GEOMETRY_NVX";
+        case 1000165004:
+            return "VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NVX";
+        case 1000165005:
+            return "VK_STRUCTURE_TYPE_GEOMETRY_AABB_NVX";
+        case 1000165006:
+            return "VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NVX";
+        case 1000165007:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_ACCELERATION_STRUCTURE_INFO_NVX";
+        case 1000165008:
+            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NVX";
+        case 1000165009:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAYTRACING_PROPERTIES_NVX";
+        case 1000165010:
+            return "VK_STRUCTURE_TYPE_HIT_SHADER_MODULE_CREATE_INFO_NVX";
+        case 1000166000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV";
+        case 1000166001:
+            return "VK_STRUCTURE_TYPE_PIPELINE_REPRESENTATIVE_FRAGMENT_TEST_STATE_CREATE_INFO_NV";
+        case 1000168000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES";
+        case 1000168001:
+            return "VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_SUPPORT";
         case 1000174000:
             return "VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT";
+        case 1000177000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR";
+        case 1000178000:
+            return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT";
+        case 1000178001:
+            return "VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT";
+        case 1000178002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT";
+        case 1000180000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR";
+        case 1000184000:
+            return "VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT";
+        case 1000185000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD";
+        case 1000190000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT";
+        case 1000190001:
+            return "VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT";
+        case 1000190002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT";
+        case 1000196000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR";
+        case 1000201000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV";
+        case 1000202000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV";
+        case 1000202001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV";
+        case 1000203000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV";
+        case 1000204000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV";
+        case 1000205000:
+            return "VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV";
+        case 1000205002:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV";
+        case 1000206000:
+            return "VK_STRUCTURE_TYPE_CHECKPOINT_DATA_NV";
+        case 1000206001:
+            return "VK_STRUCTURE_TYPE_QUEUE_FAMILY_CHECKPOINT_PROPERTIES_NV";
+        case 1000211000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES_KHR";
+        case 1000212000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT";
+        case 1000214000:
+            return "VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA";
     default:
         unreachable("Undefined enum value.");
     }
@@ -2156,13 +2519,30 @@ vk_SystemAllocationScope_to_str(VkSystemAllocationScope input)
 }
 
 const char *
-vk_TessellationDomainOriginKHR_to_str(VkTessellationDomainOriginKHR input)
+vk_TessellationDomainOrigin_to_str(VkTessellationDomainOrigin input)
+{
+    switch(input) {
+        case 0:
+            return "VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT";
+        case 1:
+            return "VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_TimeDomainEXT_to_str(VkTimeDomainEXT input)
 {
     switch(input) {
         case 0:
-            return "VK_TESSELLATION_DOMAIN_ORIGIN_UPPER_LEFT_KHR";
+            return "VK_TIME_DOMAIN_DEVICE_EXT";
         case 1:
-            return "VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT_KHR";
+            return "VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT";
+        case 2:
+            return "VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT";
+        case 3:
+            return "VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -2193,6 +2573,21 @@ vk_ValidationCheckEXT_to_str(VkValidationCheckEXT input)
 }
 
 const char *
+vk_VendorId_to_str(VkVendorId input)
+{
+    switch(input) {
+        case 65537:
+            return "VK_VENDOR_ID_VIV";
+        case 65538:
+            return "VK_VENDOR_ID_VSI";
+        case 65539:
+            return "VK_VENDOR_ID_KAZAN";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_VertexInputRate_to_str(VkVertexInputRate input)
 {
     switch(input) {
diff --git a/lib/mesa/src/vulkan/util/vk_enum_to_str.h b/lib/mesa/src/vulkan/util/vk_enum_to_str.h
index aede3d8fb..49f338ba0 100644
--- a/lib/mesa/src/vulkan/util/vk_enum_to_str.h
+++ b/lib/mesa/src/vulkan/util/vk_enum_to_str.h
@@ -28,6 +28,7 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_android_native_buffer.h>
 
+#define _VK_AMD_buffer_marker_number (180)
 #define _VK_AMD_draw_indirect_count_number (34)
 #define _VK_AMD_gcn_shader_number (26)
 #define _VK_AMD_gpu_shader_half_float_number (37)
@@ -36,24 +37,38 @@
 #define _VK_AMD_negative_viewport_height_number (36)
 #define _VK_AMD_rasterization_order_number (19)
 #define _VK_AMD_shader_ballot_number (38)
+#define _VK_AMD_shader_core_properties_number (186)
 #define _VK_AMD_shader_explicit_vertex_parameter_number (22)
 #define _VK_AMD_shader_fragment_mask_number (138)
 #define _VK_AMD_shader_image_load_store_lod_number (47)
+#define _VK_AMD_shader_info_number (43)
 #define _VK_AMD_shader_trinary_minmax_number (21)
 #define _VK_AMD_texture_gather_bias_lod_number (42)
-#define _VK_ANDROID_native_buffer_number (11)
+#define _VK_ANDROID_external_memory_android_hardware_buffer_number (130)
 #define _VK_EXT_acquire_xlib_display_number (90)
+#define _VK_EXT_astc_decode_mode_number (68)
 #define _VK_EXT_blend_operation_advanced_number (149)
+#define _VK_EXT_calibrated_timestamps_number (185)
+#define _VK_EXT_conditional_rendering_number (82)
+#define _VK_EXT_conservative_rasterization_number (102)
 #define _VK_EXT_debug_marker_number (23)
 #define _VK_EXT_debug_report_number (12)
+#define _VK_EXT_debug_utils_number (129)
 #define _VK_EXT_depth_range_unrestricted_number (14)
+#define _VK_EXT_descriptor_indexing_number (162)
 #define _VK_EXT_direct_mode_display_number (89)
 #define _VK_EXT_discard_rectangles_number (100)
 #define _VK_EXT_display_control_number (92)
 #define _VK_EXT_display_surface_counter_number (91)
+#define _VK_EXT_external_memory_dma_buf_number (126)
+#define _VK_EXT_external_memory_host_number (179)
 #define _VK_EXT_global_priority_number (175)
 #define _VK_EXT_hdr_metadata_number (106)
+#define _VK_EXT_image_drm_format_modifier_number (159)
+#define _VK_EXT_inline_uniform_block_number (139)
+#define _VK_EXT_pci_bus_info_number (213)
 #define _VK_EXT_post_depth_coverage_number (156)
+#define _VK_EXT_queue_family_foreign_number (127)
 #define _VK_EXT_sample_locations_number (144)
 #define _VK_EXT_sampler_filter_minmax_number (131)
 #define _VK_EXT_shader_stencil_export_number (141)
@@ -61,18 +76,29 @@
 #define _VK_EXT_shader_subgroup_vote_number (66)
 #define _VK_EXT_shader_viewport_index_layer_number (163)
 #define _VK_EXT_swapchain_colorspace_number (105)
+#define _VK_EXT_transform_feedback_number (29)
 #define _VK_EXT_validation_cache_number (161)
 #define _VK_EXT_validation_flags_number (62)
+#define _VK_EXT_vertex_attribute_divisor_number (191)
+#define _VK_FUCHSIA_imagepipe_surface_number (215)
+#define _VK_GOOGLE_decorate_string_number (225)
 #define _VK_GOOGLE_display_timing_number (93)
+#define _VK_GOOGLE_hlsl_functionality1_number (224)
 #define _VK_IMG_filter_cubic_number (16)
 #define _VK_IMG_format_pvrtc_number (55)
 #define _VK_KHR_16bit_storage_number (84)
+#define _VK_KHR_8bit_storage_number (178)
 #define _VK_KHR_android_surface_number (9)
 #define _VK_KHR_bind_memory2_number (158)
+#define _VK_KHR_create_renderpass2_number (110)
 #define _VK_KHR_dedicated_allocation_number (128)
 #define _VK_KHR_descriptor_update_template_number (86)
+#define _VK_KHR_device_group_number (61)
+#define _VK_KHR_device_group_creation_number (71)
 #define _VK_KHR_display_number (3)
 #define _VK_KHR_display_swapchain_number (4)
+#define _VK_KHR_draw_indirect_count_number (170)
+#define _VK_KHR_driver_properties_number (197)
 #define _VK_KHR_external_fence_number (114)
 #define _VK_KHR_external_fence_capabilities_number (113)
 #define _VK_KHR_external_fence_fd_number (116)
@@ -85,6 +111,7 @@
 #define _VK_KHR_external_semaphore_capabilities_number (77)
 #define _VK_KHR_external_semaphore_fd_number (80)
 #define _VK_KHR_external_semaphore_win32_number (79)
+#define _VK_KHR_get_display_properties2_number (122)
 #define _VK_KHR_get_memory_requirements2_number (147)
 #define _VK_KHR_get_physical_device_properties2_number (60)
 #define _VK_KHR_get_surface_capabilities2_number (120)
@@ -92,68 +119,86 @@
 #define _VK_KHR_incremental_present_number (85)
 #define _VK_KHR_maintenance1_number (70)
 #define _VK_KHR_maintenance2_number (118)
+#define _VK_KHR_maintenance3_number (169)
 #define _VK_KHR_mir_surface_number (8)
+#define _VK_KHR_multiview_number (54)
 #define _VK_KHR_push_descriptor_number (81)
 #define _VK_KHR_relaxed_block_layout_number (145)
 #define _VK_KHR_sampler_mirror_clamp_to_edge_number (15)
 #define _VK_KHR_sampler_ycbcr_conversion_number (157)
+#define _VK_KHR_shader_atomic_int64_number (181)
 #define _VK_KHR_shader_draw_parameters_number (64)
 #define _VK_KHR_shared_presentable_image_number (112)
 #define _VK_KHR_storage_buffer_storage_class_number (132)
 #define _VK_KHR_surface_number (1)
 #define _VK_KHR_swapchain_number (2)
 #define _VK_KHR_variable_pointers_number (121)
+#define _VK_KHR_vulkan_memory_model_number (212)
 #define _VK_KHR_wayland_surface_number (7)
 #define _VK_KHR_win32_keyed_mutex_number (76)
 #define _VK_KHR_win32_surface_number (10)
 #define _VK_KHR_xcb_surface_number (6)
 #define _VK_KHR_xlib_surface_number (5)
-#define _VK_KHX_device_group_number (61)
-#define _VK_KHX_device_group_creation_number (71)
-#define _VK_KHX_multiview_number (54)
 #define _VK_MVK_ios_surface_number (123)
 #define _VK_MVK_macos_surface_number (124)
 #define _VK_NN_vi_surface_number (63)
 #define _VK_NVX_device_generated_commands_number (87)
 #define _VK_NVX_multiview_per_view_attributes_number (98)
+#define _VK_NVX_raytracing_number (166)
 #define _VK_NV_clip_space_w_scaling_number (88)
+#define _VK_NV_compute_shader_derivatives_number (202)
+#define _VK_NV_corner_sampled_image_number (51)
 #define _VK_NV_dedicated_allocation_number (27)
+#define _VK_NV_device_diagnostic_checkpoints_number (207)
 #define _VK_NV_external_memory_number (57)
 #define _VK_NV_external_memory_capabilities_number (56)
 #define _VK_NV_external_memory_win32_number (58)
 #define _VK_NV_fill_rectangle_number (154)
 #define _VK_NV_fragment_coverage_to_color_number (150)
+#define _VK_NV_fragment_shader_barycentric_number (204)
 #define _VK_NV_framebuffer_mixed_samples_number (153)
 #define _VK_NV_geometry_shader_passthrough_number (96)
 #define _VK_NV_glsl_shader_number (13)
+#define _VK_NV_mesh_shader_number (203)
+#define _VK_NV_representative_fragment_test_number (167)
 #define _VK_NV_sample_mask_override_coverage_number (95)
+#define _VK_NV_scissor_exclusive_number (206)
+#define _VK_NV_shader_image_footprint_number (205)
+#define _VK_NV_shader_subgroup_partitioned_number (199)
+#define _VK_NV_shading_rate_image_number (165)
 #define _VK_NV_viewport_array2_number (97)
 #define _VK_NV_viewport_swizzle_number (99)
 #define _VK_NV_win32_keyed_mutex_number (59)
 
+const char * vk_AccelerationStructureTypeNVX_to_str(VkAccelerationStructureTypeNVX input);
 const char * vk_AttachmentLoadOp_to_str(VkAttachmentLoadOp input);
 const char * vk_AttachmentStoreOp_to_str(VkAttachmentStoreOp input);
 const char * vk_BlendFactor_to_str(VkBlendFactor input);
 const char * vk_BlendOp_to_str(VkBlendOp input);
 const char * vk_BlendOverlapEXT_to_str(VkBlendOverlapEXT input);
 const char * vk_BorderColor_to_str(VkBorderColor input);
-const char * vk_ChromaLocationKHR_to_str(VkChromaLocationKHR input);
+const char * vk_ChromaLocation_to_str(VkChromaLocation input);
+const char * vk_CoarseSampleOrderTypeNV_to_str(VkCoarseSampleOrderTypeNV input);
 const char * vk_ColorSpaceKHR_to_str(VkColorSpaceKHR input);
 const char * vk_CommandBufferLevel_to_str(VkCommandBufferLevel input);
 const char * vk_CompareOp_to_str(VkCompareOp input);
 const char * vk_ComponentSwizzle_to_str(VkComponentSwizzle input);
+const char * vk_ConservativeRasterizationModeEXT_to_str(VkConservativeRasterizationModeEXT input);
+const char * vk_CopyAccelerationStructureModeNVX_to_str(VkCopyAccelerationStructureModeNVX input);
 const char * vk_CoverageModulationModeNV_to_str(VkCoverageModulationModeNV input);
 const char * vk_DebugReportObjectTypeEXT_to_str(VkDebugReportObjectTypeEXT input);
 const char * vk_DescriptorType_to_str(VkDescriptorType input);
-const char * vk_DescriptorUpdateTemplateTypeKHR_to_str(VkDescriptorUpdateTemplateTypeKHR input);
+const char * vk_DescriptorUpdateTemplateType_to_str(VkDescriptorUpdateTemplateType input);
 const char * vk_DeviceEventTypeEXT_to_str(VkDeviceEventTypeEXT input);
 const char * vk_DiscardRectangleModeEXT_to_str(VkDiscardRectangleModeEXT input);
 const char * vk_DisplayEventTypeEXT_to_str(VkDisplayEventTypeEXT input);
 const char * vk_DisplayPowerStateEXT_to_str(VkDisplayPowerStateEXT input);
+const char * vk_DriverIdKHR_to_str(VkDriverIdKHR input);
 const char * vk_DynamicState_to_str(VkDynamicState input);
 const char * vk_Filter_to_str(VkFilter input);
 const char * vk_Format_to_str(VkFormat input);
 const char * vk_FrontFace_to_str(VkFrontFace input);
+const char * vk_GeometryTypeNVX_to_str(VkGeometryTypeNVX input);
 const char * vk_ImageLayout_to_str(VkImageLayout input);
 const char * vk_ImageTiling_to_str(VkImageTiling input);
 const char * vk_ImageType_to_str(VkImageType input);
@@ -167,7 +212,7 @@ const char * vk_ObjectType_to_str(VkObjectType input);
 const char * vk_PhysicalDeviceType_to_str(VkPhysicalDeviceType input);
 const char * vk_PipelineBindPoint_to_str(VkPipelineBindPoint input);
 const char * vk_PipelineCacheHeaderVersion_to_str(VkPipelineCacheHeaderVersion input);
-const char * vk_PointClippingBehaviorKHR_to_str(VkPointClippingBehaviorKHR input);
+const char * vk_PointClippingBehavior_to_str(VkPointClippingBehavior input);
 const char * vk_PolygonMode_to_str(VkPolygonMode input);
 const char * vk_PresentModeKHR_to_str(VkPresentModeKHR input);
 const char * vk_PrimitiveTopology_to_str(VkPrimitiveTopology input);
@@ -178,16 +223,20 @@ const char * vk_Result_to_str(VkResult input);
 const char * vk_SamplerAddressMode_to_str(VkSamplerAddressMode input);
 const char * vk_SamplerMipmapMode_to_str(VkSamplerMipmapMode input);
 const char * vk_SamplerReductionModeEXT_to_str(VkSamplerReductionModeEXT input);
-const char * vk_SamplerYcbcrModelConversionKHR_to_str(VkSamplerYcbcrModelConversionKHR input);
-const char * vk_SamplerYcbcrRangeKHR_to_str(VkSamplerYcbcrRangeKHR input);
+const char * vk_SamplerYcbcrModelConversion_to_str(VkSamplerYcbcrModelConversion input);
+const char * vk_SamplerYcbcrRange_to_str(VkSamplerYcbcrRange input);
+const char * vk_ShaderInfoTypeAMD_to_str(VkShaderInfoTypeAMD input);
+const char * vk_ShadingRatePaletteEntryNV_to_str(VkShadingRatePaletteEntryNV input);
 const char * vk_SharingMode_to_str(VkSharingMode input);
 const char * vk_StencilOp_to_str(VkStencilOp input);
 const char * vk_StructureType_to_str(VkStructureType input);
 const char * vk_SubpassContents_to_str(VkSubpassContents input);
 const char * vk_SystemAllocationScope_to_str(VkSystemAllocationScope input);
-const char * vk_TessellationDomainOriginKHR_to_str(VkTessellationDomainOriginKHR input);
+const char * vk_TessellationDomainOrigin_to_str(VkTessellationDomainOrigin input);
+const char * vk_TimeDomainEXT_to_str(VkTimeDomainEXT input);
 const char * vk_ValidationCacheHeaderVersionEXT_to_str(VkValidationCacheHeaderVersionEXT input);
 const char * vk_ValidationCheckEXT_to_str(VkValidationCheckEXT input);
+const char * vk_VendorId_to_str(VkVendorId input);
 const char * vk_VertexInputRate_to_str(VkVertexInputRate input);
 const char * vk_ViewportCoordinateSwizzleNV_to_str(VkViewportCoordinateSwizzleNV input);
 
diff --git a/lib/mesa/src/vulkan/util/vk_util.c b/lib/mesa/src/vulkan/util/vk_util.c
index 769e69062..ec95a8907 100644
--- a/lib/mesa/src/vulkan/util/vk_util.c
+++ b/lib/mesa/src/vulkan/util/vk_util.c
@@ -47,3 +47,23 @@ uint32_t vk_get_driver_version(void)
    }
    return VK_MAKE_VERSION(major, minor, patch);
 }
+
+uint32_t vk_get_version_override(void)
+{
+   const char *str = getenv("MESA_VK_VERSION_OVERRIDE");
+   if (str == NULL)
+      return 0;
+
+   const char *minor_str = strchr(str, '.');
+   const char *patch_str = minor_str ? strchr(minor_str + 1, '.') : NULL;
+
+   int major = atoi(str);
+   int minor = minor_str ? atoi(minor_str + 1) : 0;
+   int patch = patch_str ? atoi(patch_str + 1) : 0;
+
+   /* Do some basic version sanity checking */
+   if (major < 1 || minor < 0 || patch < 0 || minor > 1023 || patch > 4095)
+      return 0;
+
+   return VK_MAKE_VERSION(major, minor, patch);
+}
diff --git a/lib/mesa/src/vulkan/util/vk_util.h b/lib/mesa/src/vulkan/util/vk_util.h
index 4c18a196b..cc6a36e5a 100644
--- a/lib/mesa/src/vulkan/util/vk_util.h
+++ b/lib/mesa/src/vulkan/util/vk_util.h
@@ -199,6 +199,8 @@ __vk_find_struct(void *start, VkStructureType sType)
 
 uint32_t vk_get_driver_version(void);
 
+uint32_t vk_get_version_override(void);
+
 #define VK_EXT_OFFSET (1000000000UL)
 #define VK_ENUM_EXTENSION(__enum) \
    ((__enum) >= VK_EXT_OFFSET ? ((((__enum) - VK_EXT_OFFSET) / 1000UL) + 1) : 0)