profiles: Update to header 296

KhronosGroup · Sep 26, 2024 · baf06ff · baf06ff
1 parent a501be7
commit baf06ff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/scripts/gen_profiles_layer.py b/scripts/gen_profiles_layer.py
@@ -3033,7 +3033,7 @@ def generate_helpers(self):
 
         gen += self.generate_string_to_image_layout(registry.enums['VkImageLayout'].values)
 
-        gen += self.generate_string_to_uint(('VkToolPurposeFlagBits', 'VkSampleCountFlagBits', 'VkResolveModeFlagBits', 'VkShaderStageFlagBits', 'VkSubgroupFeatureFlagBits', 'VkShaderFloatControlsIndependence', 'VkPointClippingBehavior', 'VkOpticalFlowGridSizeFlagBitsNV', 'VkQueueFlagBits', 'VkMemoryDecompressionMethodFlagBitsNV', 'VkLayeredDriverUnderlyingApiMSFT', 'VkImageUsageFlagBits', 'VkBufferUsageFlagBits', 'VkPhysicalDeviceSchedulingControlsFlagBitsARM'), registry.enums)
+        gen += self.generate_string_to_uint(('VkToolPurposeFlagBits', 'VkSampleCountFlagBits', 'VkResolveModeFlagBits', 'VkShaderStageFlagBits', 'VkSubgroupFeatureFlagBits', 'VkShaderFloatControlsIndependence', 'VkPointClippingBehavior', 'VkOpticalFlowGridSizeFlagBitsNV', 'VkQueueFlagBits', 'VkMemoryDecompressionMethodFlagBitsNV', 'VkLayeredDriverUnderlyingApiMSFT', 'VkImageUsageFlagBits', 'VkBufferUsageFlagBits', 'VkPhysicalDeviceSchedulingControlsFlagBitsARM', 'VkIndirectCommandsInputModeFlagBitsEXT'), registry.enums)
 
         gen += self.generate_string_to_flag_functions(('VkFormatFeatureFlags', 'VkQueueFlags', 'VkQueueGlobalPriorityKHR', 'VkVideoCodecOperationFlagsKHR', 'VkPipelineStageFlags', 'VkPipelineStageFlags2', 'VkFormatFeatureFlags2'))
 

diff --git a/scripts/gen_profiles_solution.py b/scripts/gen_profiles_solution.py
@@ -3292,6 +3292,12 @@ def applyWorkarounds(self):
         if 'VkPhysicalDeviceMaintenance6PropertiesKHR' in self.structs:
             self.structs['VkPhysicalDeviceMaintenance6PropertiesKHR'].members['maxCombinedImageSamplerDescriptorCount'].limittype = 'max'
 
+        if 'VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT' in self.structs:
+            self.structs['VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT'].members['supportedIndirectCommandsInputModes'].limittype = 'bitmask'
+            self.structs['VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT'].members['supportedIndirectCommandsShaderStages'].limittype = 'bitmask'
+            self.structs['VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT'].members['supportedIndirectCommandsShaderStagesPipelineBinding'].limittype = 'bitmask'
+            self.structs['VkPhysicalDeviceDeviceGeneratedCommandsPropertiesEXT'].members['supportedIndirectCommandsShaderStagesShaderBinding'].limittype = 'bitmask'
+
         # TODO: The registry xml is also missing limittype definitions for format and queue family properties
         # For now we just add the important ones, this needs a larger overhaul in the vk.xml
         self.structs['VkFormatProperties'].members['linearTilingFeatures'].limittype = 'bitmask'

diff --git a/scripts/gen_profiles_tests.py b/scripts/gen_profiles_tests.py
@@ -486,6 +486,11 @@ def gen_properties(self, extensions, registry):
                         gen += enum[0]
                         self.test_values[name][property] = enum[1]
                         self.i += 1
+                    elif property_type == "VkIndirectCommandsInputModeFlagsEXT":
+                        enum = self.get_enum('VkIndirectCommandsInputModeFlagBitsEXT', True)
+                        gen += enum[0]
+                        self.test_values[name][property] = enum[1]
+                        self.i += 1
                     elif property_type == "char":
                         gen += "\""
                         gen += property_name

diff --git a/scripts/known_good.json b/scripts/known_good.json
@@ -9,15 +9,15 @@
             "cmake_options": [
                 "-DVULKAN_HEADERS_ENABLE_MODULE=OFF"
             ],
-            "commit": "v1.3.295"
+            "commit": "v1.3.296"
         },
         {
             "name": "Vulkan-Utility-Libraries",
             "url": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git",
             "sub_dir": "Vulkan-Utility-Libraries",
             "build_dir": "Vulkan-Utility-Libraries/build",
             "install_dir": "Vulkan-Utility-Libraries/build/install",
-            "commit": "v1.3.295",
+            "commit": "v1.3.296",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",