From 73c5e04436a2e5e50ee6e83b2dc24636dd21ac57 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 12 Dec 2025 09:01:53 -0800 Subject: build: Update to header 1.4.336 --- CMakeLists.txt | 2 +- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 6 ++++++ icd/generated/function_definitions.h | 6 ++++++ icd/generated/vk_typemap_helper.h | 18 ++++++++++++++++++ scripts/known_good.json | 4 ++-- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a4c18b1..882c7a71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.22.1) # The VERSION field is generated with the "--generated-version" flag in the generate_source.py script -project(Vulkan-Tools VERSION 1.4.335) +project(Vulkan-Tools VERSION 1.4.336) # This variable enables downstream users to customize the target API # variant (e.g. Vulkan SC) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index 8e3296c2..9c610bfe 100644 --- a/icd/VkICD_mock_icd.json.in +++ b/icd/VkICD_mock_icd.json.in @@ -2,6 +2,6 @@ "file_format_version": "1.0.1", "ICD": { "library_path": "@JSON_LIBRARY_PATH@", - "api_version": "1.4.335" + "api_version": "1.4.336" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 8cb673c7..5d4cf15f 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -541,6 +541,7 @@ static const std::unordered_map device_extension_map = { {"VK_QCOM_data_graph_model", VK_QCOM_DATA_GRAPH_MODEL_SPEC_VERSION}, {"VK_SEC_pipeline_cache_incremental_mode", VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION}, {"VK_EXT_shader_uniform_buffer_unsized_array", VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION}, + {"VK_NV_compute_occupancy_priority", VK_NV_COMPUTE_OCCUPANCY_PRIORITY_SPEC_VERSION}, {"VK_KHR_acceleration_structure", VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION}, {"VK_KHR_ray_tracing_pipeline", VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION}, {"VK_KHR_ray_query", VK_KHR_RAY_QUERY_SPEC_VERSION}, @@ -4591,6 +4592,10 @@ static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT( VkCommandBuffer commandBuffer, const VkBeginCustomResolveInfoEXT* pBeginCustomResolveInfo); +static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV( + VkCommandBuffer commandBuffer, + const VkComputeOccupancyPriorityParametersNV* pParameters); + static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, @@ -5637,6 +5642,7 @@ static const std::unordered_map name_to_funcptr_map = { {"vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM", (void*)EnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM}, {"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT}, {"vkCmdBeginCustomResolveEXT", (void*)CmdBeginCustomResolveEXT}, + {"vkCmdSetComputeOccupancyPriorityNV", (void*)CmdSetComputeOccupancyPriorityNV}, {"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR}, {"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR}, {"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 141b3bd3..ef42bfca 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -6817,6 +6817,12 @@ static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT( { //Not a CREATE or DESTROY function } +static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV( + VkCommandBuffer commandBuffer, + const VkComputeOccupancyPriorityParametersNV* pParameters) +{ +//Not a CREATE or DESTROY function +} static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR( VkDevice device, const VkAccelerationStructureCreateInfoKHR* pCreateInfo, diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 2b6e3c10..d655dd0a 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -10304,6 +10304,24 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_COMPUTE_OCCUPANCY_PRIORITY_PARAMETERS_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkComputeOccupancyPriorityParametersNV Type; +}; + +// Map type VkPhysicalDeviceComputeOccupancyPriorityFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_OCCUPANCY_PRIORITY_FEATURES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_OCCUPANCY_PRIORITY_FEATURES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceComputeOccupancyPriorityFeaturesNV Type; +}; + // Map type VkAccelerationStructureGeometryTrianglesDataKHR to id VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR; diff --git a/scripts/known_good.json b/scripts/known_good.json index a04bc19c..7b04e9ae 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.4.335" + "commit": "v1.4.336" }, { "name": "MoltenVK", @@ -56,7 +56,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.335", + "commit": "v1.4.336", "build_platforms": [ "windows", "linux", -- cgit v1.2.3