Merge Mesa 19.0.5

4 files changed, 190 insertions, 37 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 fb9ecd65c..06f74eb48 100644
--- a/lib/mesa/src/vulkan/util/gen_enum_to_str.py
+++ b/lib/mesa/src/vulkan/util/gen_enum_to_str.py
@@ -101,6 +101,10 @@ H_TEMPLATE = Template(textwrap.dedent(u"""\
     #include <vulkan/vulkan.h>
     #include <vulkan/vk_android_native_buffer.h>
 
+    #ifdef __cplusplus
+    extern "C" {
+    #endif
+
     % for ext in extensions:
     #define _${ext.name}_number (${ext.number})
     % endfor
@@ -109,6 +113,10 @@ H_TEMPLATE = Template(textwrap.dedent(u"""\
     const char * vk_${enum.name[2:]}_to_str(${enum.name} input);
     % endfor
 
+    #ifdef __cplusplus
+    } /* extern "C" */
+    #endif
+
     #endif"""),
     output_encoding='utf-8')
 
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 6e08209f2..74dba8c1c 100644
--- a/lib/mesa/src/vulkan/util/vk_enum_to_str.c
+++ b/lib/mesa/src/vulkan/util/vk_enum_to_str.c
@@ -29,13 +29,28 @@
 
 
 const char *
-vk_AccelerationStructureTypeNVX_to_str(VkAccelerationStructureTypeNVX input)
+vk_AccelerationStructureMemoryRequirementsTypeNV_to_str(VkAccelerationStructureMemoryRequirementsTypeNV input)
 {
     switch(input) {
         case 0:
-            return "VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_NVX";
+            return "VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_OBJECT_NV";
         case 1:
-            return "VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_NVX";
+            return "VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_BUILD_SCRATCH_NV";
+        case 2:
+            return "VK_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_TYPE_UPDATE_SCRATCH_NV";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_AccelerationStructureTypeNV_to_str(VkAccelerationStructureTypeNV input)
+{
+    switch(input) {
+        case 0:
+            return "VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_NV";
+        case 1:
+            return "VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -409,13 +424,13 @@ vk_ConservativeRasterizationModeEXT_to_str(VkConservativeRasterizationModeEXT in
 }
 
 const char *
-vk_CopyAccelerationStructureModeNVX_to_str(VkCopyAccelerationStructureModeNVX input)
+vk_CopyAccelerationStructureModeNV_to_str(VkCopyAccelerationStructureModeNV input)
 {
     switch(input) {
         case 0:
-            return "VK_COPY_ACCELERATION_STRUCTURE_MODE_CLONE_NVX";
+            return "VK_COPY_ACCELERATION_STRUCTURE_MODE_CLONE_NV";
         case 1:
-            return "VK_COPY_ACCELERATION_STRUCTURE_MODE_COMPACT_NVX";
+            return "VK_COPY_ACCELERATION_STRUCTURE_MODE_COMPACT_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -515,7 +530,7 @@ vk_DebugReportObjectTypeEXT_to_str(VkDebugReportObjectTypeEXT input)
         case 1000156000:
             return "VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT";
         case 1000165000:
-            return "VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NVX_EXT";
+            return "VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -550,7 +565,7 @@ vk_DescriptorType_to_str(VkDescriptorType input)
         case 1000138000:
             return "VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT";
         case 1000165000:
-            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NVX";
+            return "VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -641,6 +656,8 @@ vk_DriverIdKHR_to_str(VkDriverIdKHR input)
             return "VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR";
         case 9:
             return "VK_DRIVER_ID_ARM_PROPRIETARY_KHR";
+        case 10:
+            return "VK_DRIVER_ID_GOOGLE_PASTEL_KHR";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1177,13 +1194,13 @@ vk_FrontFace_to_str(VkFrontFace input)
 }
 
 const char *
-vk_GeometryTypeNVX_to_str(VkGeometryTypeNVX input)
+vk_GeometryTypeNV_to_str(VkGeometryTypeNV input)
 {
     switch(input) {
         case 0:
-            return "VK_GEOMETRY_TYPE_TRIANGLES_NVX";
+            return "VK_GEOMETRY_TYPE_TRIANGLES_NV";
         case 1:
-            return "VK_GEOMETRY_TYPE_AABBS_NVX";
+            return "VK_GEOMETRY_TYPE_AABBS_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1221,6 +1238,8 @@ vk_ImageLayout_to_str(VkImageLayout input)
             return "VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL";
         case 1000164003:
             return "VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV";
+        case 1000218000:
+            return "VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1287,6 +1306,8 @@ vk_IndexType_to_str(VkIndexType input)
             return "VK_INDEX_TYPE_UINT16";
         case 1:
             return "VK_INDEX_TYPE_UINT32";
+        case 1000165000:
+            return "VK_INDEX_TYPE_NONE_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1370,6 +1391,21 @@ vk_LogicOp_to_str(VkLogicOp input)
 }
 
 const char *
+vk_MemoryOverallocationBehaviorAMD_to_str(VkMemoryOverallocationBehaviorAMD input)
+{
+    switch(input) {
+        case 0:
+            return "VK_MEMORY_OVERALLOCATION_BEHAVIOR_DEFAULT_AMD";
+        case 1:
+            return "VK_MEMORY_OVERALLOCATION_BEHAVIOR_ALLOWED_AMD";
+        case 2:
+            return "VK_MEMORY_OVERALLOCATION_BEHAVIOR_DISALLOWED_AMD";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_ObjectEntryTypeNVX_to_str(VkObjectEntryTypeNVX input)
 {
     switch(input) {
@@ -1467,7 +1503,7 @@ vk_ObjectType_to_str(VkObjectType input)
         case 1000160000:
             return "VK_OBJECT_TYPE_VALIDATION_CACHE_EXT";
         case 1000165000:
-            return "VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NVX";
+            return "VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1501,7 +1537,7 @@ vk_PipelineBindPoint_to_str(VkPipelineBindPoint input)
         case 1:
             return "VK_PIPELINE_BIND_POINT_COMPUTE";
         case 1000165000:
-            return "VK_PIPELINE_BIND_POINT_RAYTRACING_NVX";
+            return "VK_PIPELINE_BIND_POINT_RAY_TRACING_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1613,7 +1649,7 @@ vk_QueryType_to_str(VkQueryType input)
         case 1000028004:
             return "VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT";
         case 1000165000:
-            return "VK_QUERY_TYPE_COMPACTED_SIZE_NVX";
+            return "VK_QUERY_TYPE_ACCELERATION_STRUCTURE_COMPACTED_SIZE_NV";
     default:
         unreachable("Undefined enum value.");
     }
@@ -1650,9 +1686,26 @@ vk_RasterizationOrderAMD_to_str(VkRasterizationOrderAMD input)
 }
 
 const char *
+vk_RayTracingShaderGroupTypeNV_to_str(VkRayTracingShaderGroupTypeNV input)
+{
+    switch(input) {
+        case 0:
+            return "VK_RAY_TRACING_SHADER_GROUP_TYPE_GENERAL_NV";
+        case 1:
+            return "VK_RAY_TRACING_SHADER_GROUP_TYPE_TRIANGLES_HIT_GROUP_NV";
+        case 2:
+            return "VK_RAY_TRACING_SHADER_GROUP_TYPE_PROCEDURAL_HIT_GROUP_NV";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_Result_to_str(VkResult input)
 {
     switch(input) {
+        case -1000244000:
+            return "VK_ERROR_INVALID_DEVICE_ADDRESS_EXT";
         case -1000174001:
             return "VK_ERROR_NOT_PERMITTED_EXT";
         case -1000161000:
@@ -2001,8 +2054,6 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR";
         case 1000006000:
             return "VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR";
-        case 1000007000:
-            return "VK_STRUCTURE_TYPE_MIR_SURFACE_CREATE_INFO_KHR";
         case 1000008000:
             return "VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR";
         case 1000009000:
@@ -2165,6 +2216,8 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT";
         case 1000081002:
             return "VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT";
+        case 1000082000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR";
         case 1000083000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES";
         case 1000084000:
@@ -2404,27 +2457,27 @@ vk_StructureType_to_str(VkStructureType input)
         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";
+            return "VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_NV";
         case 1000165001:
-            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NVX";
-        case 1000165002:
-            return "VK_STRUCTURE_TYPE_GEOMETRY_INSTANCE_NVX";
+            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_CREATE_INFO_NV";
         case 1000165003:
-            return "VK_STRUCTURE_TYPE_GEOMETRY_NVX";
+            return "VK_STRUCTURE_TYPE_GEOMETRY_NV";
         case 1000165004:
-            return "VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NVX";
+            return "VK_STRUCTURE_TYPE_GEOMETRY_TRIANGLES_NV";
         case 1000165005:
-            return "VK_STRUCTURE_TYPE_GEOMETRY_AABB_NVX";
+            return "VK_STRUCTURE_TYPE_GEOMETRY_AABB_NV";
         case 1000165006:
-            return "VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NVX";
+            return "VK_STRUCTURE_TYPE_BIND_ACCELERATION_STRUCTURE_MEMORY_INFO_NV";
         case 1000165007:
-            return "VK_STRUCTURE_TYPE_DESCRIPTOR_ACCELERATION_STRUCTURE_INFO_NVX";
+            return "VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_NV";
         case 1000165008:
-            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NVX";
+            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_MEMORY_REQUIREMENTS_INFO_NV";
         case 1000165009:
-            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAYTRACING_PROPERTIES_NVX";
-        case 1000165010:
-            return "VK_STRUCTURE_TYPE_HIT_SHADER_MODULE_CREATE_INFO_NVX";
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PROPERTIES_NV";
+        case 1000165011:
+            return "VK_STRUCTURE_TYPE_RAY_TRACING_SHADER_GROUP_CREATE_INFO_NV";
+        case 1000165012:
+            return "VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_INFO_NV";
         case 1000166000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_REPRESENTATIVE_FRAGMENT_TEST_FEATURES_NV";
         case 1000166001:
@@ -2449,6 +2502,8 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_CALIBRATED_TIMESTAMP_INFO_EXT";
         case 1000185000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD";
+        case 1000189000:
+            return "VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD";
         case 1000190000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT";
         case 1000190001:
@@ -2457,6 +2512,12 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT";
         case 1000196000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR";
+        case 1000197000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR";
+        case 1000199000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR";
+        case 1000199001:
+            return "VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR";
         case 1000201000:
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV";
         case 1000202000:
@@ -2481,6 +2542,30 @@ vk_StructureType_to_str(VkStructureType input)
             return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PCI_BUS_INFO_PROPERTIES_EXT";
         case 1000214000:
             return "VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA";
+        case 1000218000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT";
+        case 1000218001:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT";
+        case 1000218002:
+            return "VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT";
+        case 1000221000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT";
+        case 1000237000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT";
+        case 1000238000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT";
+        case 1000238001:
+            return "VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT";
+        case 1000244000:
+            return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT";
+        case 1000244001:
+            return "VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT";
+        case 1000244002:
+            return "VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT";
+        case 1000246000:
+            return "VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT";
+        case 1000247000:
+            return "VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT";
     default:
         unreachable("Undefined enum value.");
     }
@@ -2573,6 +2658,42 @@ vk_ValidationCheckEXT_to_str(VkValidationCheckEXT input)
 }
 
 const char *
+vk_ValidationFeatureDisableEXT_to_str(VkValidationFeatureDisableEXT input)
+{
+    switch(input) {
+        case 0:
+            return "VK_VALIDATION_FEATURE_DISABLE_ALL_EXT";
+        case 1:
+            return "VK_VALIDATION_FEATURE_DISABLE_SHADERS_EXT";
+        case 2:
+            return "VK_VALIDATION_FEATURE_DISABLE_THREAD_SAFETY_EXT";
+        case 3:
+            return "VK_VALIDATION_FEATURE_DISABLE_API_PARAMETERS_EXT";
+        case 4:
+            return "VK_VALIDATION_FEATURE_DISABLE_OBJECT_LIFETIMES_EXT";
+        case 5:
+            return "VK_VALIDATION_FEATURE_DISABLE_CORE_CHECKS_EXT";
+        case 6:
+            return "VK_VALIDATION_FEATURE_DISABLE_UNIQUE_HANDLES_EXT";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
+vk_ValidationFeatureEnableEXT_to_str(VkValidationFeatureEnableEXT input)
+{
+    switch(input) {
+        case 0:
+            return "VK_VALIDATION_FEATURE_ENABLE_GPU_ASSISTED_EXT";
+        case 1:
+            return "VK_VALIDATION_FEATURE_ENABLE_GPU_ASSISTED_RESERVE_BINDING_SLOT_EXT";
+    default:
+        unreachable("Undefined enum value.");
+    }
+}
+
+const char *
 vk_VendorId_to_str(VkVendorId 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 49f338ba0..95dbdcdd9 100644
--- a/lib/mesa/src/vulkan/util/vk_enum_to_str.h
+++ b/lib/mesa/src/vulkan/util/vk_enum_to_str.h
@@ -28,11 +28,16 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_android_native_buffer.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #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)
 #define _VK_AMD_gpu_shader_int16_number (133)
+#define _VK_AMD_memory_overallocation_behavior_number (190)
 #define _VK_AMD_mixed_attachment_samples_number (137)
 #define _VK_AMD_negative_viewport_height_number (36)
 #define _VK_AMD_rasterization_order_number (19)
@@ -48,6 +53,7 @@
 #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_buffer_device_address_number (245)
 #define _VK_EXT_calibrated_timestamps_number (185)
 #define _VK_EXT_conditional_rendering_number (82)
 #define _VK_EXT_conservative_rasterization_number (102)
@@ -62,15 +68,20 @@
 #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_fragment_density_map_number (219)
 #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_memory_budget_number (238)
+#define _VK_EXT_memory_priority_number (239)
 #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_scalar_block_layout_number (222)
+#define _VK_EXT_separate_stencil_usage_number (247)
 #define _VK_EXT_shader_stencil_export_number (141)
 #define _VK_EXT_shader_subgroup_ballot_number (65)
 #define _VK_EXT_shader_subgroup_vote_number (66)
@@ -78,6 +89,7 @@
 #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_features_number (248)
 #define _VK_EXT_validation_flags_number (62)
 #define _VK_EXT_vertex_attribute_divisor_number (191)
 #define _VK_FUCHSIA_imagepipe_surface_number (215)
@@ -92,6 +104,7 @@
 #define _VK_KHR_bind_memory2_number (158)
 #define _VK_KHR_create_renderpass2_number (110)
 #define _VK_KHR_dedicated_allocation_number (128)
+#define _VK_KHR_depth_stencil_resolve_number (200)
 #define _VK_KHR_descriptor_update_template_number (86)
 #define _VK_KHR_device_group_number (61)
 #define _VK_KHR_device_group_creation_number (71)
@@ -120,7 +133,6 @@
 #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)
@@ -128,10 +140,13 @@
 #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_shader_float16_int8_number (83)
+#define _VK_KHR_shader_float_controls_number (198)
 #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_swapchain_mutable_format_number (201)
 #define _VK_KHR_variable_pointers_number (121)
 #define _VK_KHR_vulkan_memory_model_number (212)
 #define _VK_KHR_wayland_surface_number (7)
@@ -144,7 +159,6 @@
 #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)
@@ -160,6 +174,7 @@
 #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_ray_tracing_number (166)
 #define _VK_NV_representative_fragment_test_number (167)
 #define _VK_NV_sample_mask_override_coverage_number (95)
 #define _VK_NV_scissor_exclusive_number (206)
@@ -170,7 +185,8 @@
 #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_AccelerationStructureMemoryRequirementsTypeNV_to_str(VkAccelerationStructureMemoryRequirementsTypeNV input);
+const char * vk_AccelerationStructureTypeNV_to_str(VkAccelerationStructureTypeNV 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);
@@ -184,7 +200,7 @@ 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_CopyAccelerationStructureModeNV_to_str(VkCopyAccelerationStructureModeNV 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);
@@ -198,7 +214,7 @@ 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_GeometryTypeNV_to_str(VkGeometryTypeNV 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);
@@ -207,6 +223,7 @@ const char * vk_IndexType_to_str(VkIndexType input);
 const char * vk_IndirectCommandsTokenTypeNVX_to_str(VkIndirectCommandsTokenTypeNVX input);
 const char * vk_InternalAllocationType_to_str(VkInternalAllocationType input);
 const char * vk_LogicOp_to_str(VkLogicOp input);
+const char * vk_MemoryOverallocationBehaviorAMD_to_str(VkMemoryOverallocationBehaviorAMD input);
 const char * vk_ObjectEntryTypeNVX_to_str(VkObjectEntryTypeNVX input);
 const char * vk_ObjectType_to_str(VkObjectType input);
 const char * vk_PhysicalDeviceType_to_str(VkPhysicalDeviceType input);
@@ -219,6 +236,7 @@ const char * vk_PrimitiveTopology_to_str(VkPrimitiveTopology input);
 const char * vk_QueryType_to_str(VkQueryType input);
 const char * vk_QueueGlobalPriorityEXT_to_str(VkQueueGlobalPriorityEXT input);
 const char * vk_RasterizationOrderAMD_to_str(VkRasterizationOrderAMD input);
+const char * vk_RayTracingShaderGroupTypeNV_to_str(VkRayTracingShaderGroupTypeNV input);
 const char * vk_Result_to_str(VkResult input);
 const char * vk_SamplerAddressMode_to_str(VkSamplerAddressMode input);
 const char * vk_SamplerMipmapMode_to_str(VkSamplerMipmapMode input);
@@ -236,8 +254,14 @@ 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_ValidationFeatureDisableEXT_to_str(VkValidationFeatureDisableEXT input);
+const char * vk_ValidationFeatureEnableEXT_to_str(VkValidationFeatureEnableEXT 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);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif
\ No newline at end of file
diff --git a/lib/mesa/src/vulkan/util/vk_util.c b/lib/mesa/src/vulkan/util/vk_util.c
index ec95a8907..cf06b1f44 100644
--- a/lib/mesa/src/vulkan/util/vk_util.c
+++ b/lib/mesa/src/vulkan/util/vk_util.c
@@ -29,12 +29,12 @@
 
 uint32_t vk_get_driver_version(void)
 {
-   const char *minor_string = strchr(VERSION, '.');
+   const char *minor_string = strchr(PACKAGE_VERSION, '.');
    const char *patch_string = minor_string ? strchr(minor_string + 1, '.') : NULL;
-   int major = atoi(VERSION);
+   int major = atoi(PACKAGE_VERSION);
    int minor = minor_string ? atoi(minor_string + 1) : 0;
    int patch = patch_string ? atoi(patch_string + 1) : 0;
-   if (strstr(VERSION, "devel")) {
+   if (strstr(PACKAGE_VERSION, "devel")) {
       if (patch == 0) {
          patch = 99;
          if (minor == 0) {