From 4f965e1de79ba354fff816f1108cc25066847be0 Mon Sep 17 00:00:00 2001
From: Mike Schuchardt <mikes@lunarg.com>
Date: Mon, 2 Dec 2024 08:31:22 -0800
Subject: build: Update to header 1.4.303

---
 scripts/known_good.json         |  4 ++--
 scripts/vulkaninfo_generator.py | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/known_good.json b/scripts/known_good.json
index aa0adebe..7a6839f0 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -7,7 +7,7 @@
             "sub_dir": "Vulkan-Headers",
             "build_dir": "Vulkan-Headers/build",
             "install_dir": "Vulkan-Headers/build/install",
-            "commit": "v1.3.302"
+            "commit": "v1.4.303"
         },
         {
             "name": "MoltenVK",
@@ -74,7 +74,7 @@
             "cmake_options": [
                 "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
             ],
-            "commit": "v1.3.302",
+            "commit": "v1.4.303",
             "build_platforms": [
                 "windows",
                 "linux",
diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py
index e4cdd1e9..c0d7ee49 100644
--- a/scripts/vulkaninfo_generator.py
+++ b/scripts/vulkaninfo_generator.py
@@ -79,7 +79,7 @@ std::string to_hex_str(Printer &p, const T i) {
 # used in the .cpp code
 STRUCTURES_TO_GEN = ['VkExtent3D', 'VkExtent2D', 'VkPhysicalDeviceLimits', 'VkPhysicalDeviceFeatures', 'VkPhysicalDeviceSparseProperties',
                      'VkSurfaceCapabilitiesKHR', 'VkSurfaceFormatKHR', 'VkLayerProperties', 'VkPhysicalDeviceToolProperties', 'VkFormatProperties',
-                     'VkSurfacePresentScalingCapabilitiesEXT', 'VkSurfacePresentModeCompatibilityEXT', 'VkPhysicalDeviceHostImageCopyPropertiesEXT']
+                     'VkSurfacePresentScalingCapabilitiesEXT', 'VkSurfacePresentModeCompatibilityEXT', 'VkPhysicalDeviceHostImageCopyProperties']
 ENUMS_TO_GEN = ['VkResult', 'VkFormat', 'VkPresentModeKHR',
                 'VkPhysicalDeviceType', 'VkImageTiling']
 FLAGS_TO_GEN = ['VkSurfaceTransformFlagsKHR', 'VkCompositeAlphaFlagsKHR', 'VkSurfaceCounterFlagsEXT', 'VkQueueFlags',
@@ -419,6 +419,8 @@ class VulkanInfoGenerator(OutputGenerator):
                 if comment is not None and comment.find('Promoted from') >= 0:
                     # may need tweaking in the future - some ext names aren't just the upper case version
                     original_ext = comment.split(' ')[2].upper() + '_EXTENSION_NAME'
+                    # insert an underscore before numbers in the name define
+                    original_ext = re.sub(r'([A-Z])(\d+)', r'\1_\2', original_ext)
                 min_val = 2**32
                 max_val = 0
                 for enum in require.findall('enum'):
@@ -647,13 +649,13 @@ def PrintStructure(struct):
                 out += f'    p.PrintKeyValue("{v.name}", obj.{v.name});\n'
                 if v.arrayLength == '8':
                     out += '    }\n'
-            elif struct.name == 'VkQueueFamilyGlobalPriorityPropertiesKHR' and v.name == 'priorities':
+            elif struct.name == 'VkQueueFamilyGlobalPriorityProperties' and v.name == 'priorities':
                 out += f'    ArrayWrapper arr(p,"{v.name}", obj.priorityCount);\n'
                 out += '    for (uint32_t i = 0; i < obj.priorityCount; i++) {\n'
                 out += '       if (p.Type() == OutputType::json)\n'
-                out += '           p.PrintString(std::string("VK_") + VkQueueGlobalPriorityKHRString(obj.priorities[i]));\n'
+                out += '           p.PrintString(std::string("VK_") + VkQueueGlobalPriorityString(obj.priorities[i]));\n'
                 out += '       else\n'
-                out += '           p.PrintString(VkQueueGlobalPriorityKHRString(obj.priorities[i]));\n'
+                out += '           p.PrintString(VkQueueGlobalPriorityString(obj.priorities[i]));\n'
                 out += '    }\n'
             elif v.arrayLength.isdigit():
                 out += f'    {{\n        ArrayWrapper arr(p,"{v.name}", ' + v.arrayLength + ');\n'
-- 
cgit v1.2.3