From 1d6e26f1d84e92ce9b700e2609f008fe53e33666 Mon Sep 17 00:00:00 2001 From: ziga-lunarg Date: Thu, 26 Sep 2024 17:19:19 +0200 Subject: [PATCH] profiles: Update to header 296 --- scripts/gen_profiles_layer.py | 2 +- scripts/gen_profiles_solution.py | 6 ++++++ scripts/gen_profiles_tests.py | 5 +++++ scripts/known_good.json | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/gen_profiles_layer.py b/scripts/gen_profiles_layer.py index 3da0db30..bab71af8 100644 --- 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 index 7658e03b..5eefcba0 100644 --- 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 index aeb5e6d0..f6072884 100644 --- 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 index cf6b3a77..5f8959eb 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -9,7 +9,7 @@ "cmake_options": [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ], - "commit": "v1.3.295" + "commit": "v1.3.296" }, { "name": "Vulkan-Utility-Libraries", @@ -17,7 +17,7 @@ "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",