From 9c0fff2798d769b4c0681001c24d3d55467dde8f Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 4 Apr 2025 10:58:09 -0700 Subject: build: Update to header 1.4.312 --- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 37 ++++++++++++++ icd/generated/function_definitions.h | 49 +++++++++++++++++++ icd/generated/vk_typemap_helper.h | 90 +++++++++++++++++++++++++++++++++++ scripts/known_good.json | 4 +- 5 files changed, 179 insertions(+), 3 deletions(-) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index 4b8f2215..6780533b 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.311" + "api_version": "1.4.312" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 8ee5d0ee..16b3240e 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -285,6 +285,7 @@ static const std::unordered_map device_extension_map = { {"VK_NV_device_diagnostics_config", 2}, {"VK_QCOM_render_pass_store_ops", 2}, {"VK_NV_cuda_kernel_launch", 2}, + {"VK_QCOM_tile_shading", 1}, {"VK_NV_low_latency", 1}, {"VK_EXT_metal_objects", 2}, {"VK_KHR_synchronization2", 1}, @@ -412,6 +413,7 @@ static const std::unordered_map device_extension_map = { {"VK_NV_descriptor_pool_overallocation", 1}, {"VK_KHR_video_encode_quantization_map", 2}, {"VK_NV_raw_access_chains", 1}, + {"VK_NV_external_compute_queue", 1}, {"VK_KHR_shader_relaxed_extended_instruction", 1}, {"VK_NV_command_buffer_inheritance", 1}, {"VK_KHR_maintenance7", 1}, @@ -3796,6 +3798,18 @@ static VKAPI_ATTR void VKAPI_CALL CmdCudaLaunchKernelNV( #endif /* VK_ENABLE_BETA_EXTENSIONS */ +static VKAPI_ATTR void VKAPI_CALL CmdDispatchTileQCOM( + VkCommandBuffer commandBuffer); + +static VKAPI_ATTR void VKAPI_CALL CmdBeginPerTileExecutionQCOM( + VkCommandBuffer commandBuffer, + const VkPerTileBeginInfoQCOM* pPerTileBeginInfo); + +static VKAPI_ATTR void VKAPI_CALL CmdEndPerTileExecutionQCOM( + VkCommandBuffer commandBuffer, + const VkPerTileEndInfoQCOM* pPerTileEndInfo); + + #ifdef VK_USE_PLATFORM_METAL_EXT static VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT( @@ -4554,6 +4568,23 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetScreenBufferPropertiesQNX( +static VKAPI_ATTR VkResult VKAPI_CALL CreateExternalComputeQueueNV( + VkDevice device, + const VkExternalComputeQueueCreateInfoNV* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkExternalComputeQueueNV* pExternalQueue); + +static VKAPI_ATTR void VKAPI_CALL DestroyExternalComputeQueueNV( + VkDevice device, + VkExternalComputeQueueNV externalQueue, + const VkAllocationCallbacks* pAllocator); + +static VKAPI_ATTR void VKAPI_CALL GetExternalComputeQueueDataNV( + VkExternalComputeQueueNV externalQueue, + VkExternalComputeQueueDataParamsNV* params, + void* pData); + + @@ -5471,6 +5502,9 @@ static const std::unordered_map name_to_funcptr_map = { #ifdef VK_ENABLE_BETA_EXTENSIONS {"vkCmdCudaLaunchKernelNV", (void*)CmdCudaLaunchKernelNV}, #endif + {"vkCmdDispatchTileQCOM", (void*)CmdDispatchTileQCOM}, + {"vkCmdBeginPerTileExecutionQCOM", (void*)CmdBeginPerTileExecutionQCOM}, + {"vkCmdEndPerTileExecutionQCOM", (void*)CmdEndPerTileExecutionQCOM}, #ifdef VK_USE_PLATFORM_METAL_EXT {"vkExportMetalObjectsEXT", (void*)ExportMetalObjectsEXT}, #endif @@ -5630,6 +5664,9 @@ static const std::unordered_map name_to_funcptr_map = { #ifdef VK_USE_PLATFORM_SCREEN_QNX {"vkGetScreenBufferPropertiesQNX", (void*)GetScreenBufferPropertiesQNX}, #endif + {"vkCreateExternalComputeQueueNV", (void*)CreateExternalComputeQueueNV}, + {"vkDestroyExternalComputeQueueNV", (void*)DestroyExternalComputeQueueNV}, + {"vkGetExternalComputeQueueDataNV", (void*)GetExternalComputeQueueDataNV}, {"vkGetClusterAccelerationStructureBuildSizesNV", (void*)GetClusterAccelerationStructureBuildSizesNV}, {"vkCmdBuildClusterAccelerationStructureIndirectNV", (void*)CmdBuildClusterAccelerationStructureIndirectNV}, {"vkGetPartitionedAccelerationStructuresBuildSizesNV", (void*)GetPartitionedAccelerationStructuresBuildSizesNV}, diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index ac51eb3e..40b7e984 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -7041,6 +7041,27 @@ static VKAPI_ATTR void VKAPI_CALL CmdCudaLaunchKernelNV( #endif /* VK_ENABLE_BETA_EXTENSIONS */ +static VKAPI_ATTR void VKAPI_CALL CmdDispatchTileQCOM( + VkCommandBuffer commandBuffer) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdBeginPerTileExecutionQCOM( + VkCommandBuffer commandBuffer, + const VkPerTileBeginInfoQCOM* pPerTileBeginInfo) +{ +//Not a CREATE or DESTROY function +} + +static VKAPI_ATTR void VKAPI_CALL CmdEndPerTileExecutionQCOM( + VkCommandBuffer commandBuffer, + const VkPerTileEndInfoQCOM* pPerTileEndInfo) +{ +//Not a CREATE or DESTROY function +} + + #ifdef VK_USE_PLATFORM_METAL_EXT static VKAPI_ATTR void VKAPI_CALL ExportMetalObjectsEXT( @@ -8229,6 +8250,34 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetScreenBufferPropertiesQNX( +static VKAPI_ATTR VkResult VKAPI_CALL CreateExternalComputeQueueNV( + VkDevice device, + const VkExternalComputeQueueCreateInfoNV* pCreateInfo, + const VkAllocationCallbacks* pAllocator, + VkExternalComputeQueueNV* pExternalQueue) +{ + unique_lock_t lock(global_lock); + *pExternalQueue = (VkExternalComputeQueueNV)CreateDispObjHandle(); + return VK_SUCCESS; +} + +static VKAPI_ATTR void VKAPI_CALL DestroyExternalComputeQueueNV( + VkDevice device, + VkExternalComputeQueueNV externalQueue, + const VkAllocationCallbacks* pAllocator) +{ +//Destroy object +} + +static VKAPI_ATTR void VKAPI_CALL GetExternalComputeQueueDataNV( + VkExternalComputeQueueNV externalQueue, + VkExternalComputeQueueDataParamsNV* params, + void* pData) +{ +//Not a CREATE or DESTROY function +} + + diff --git a/icd/generated/vk_typemap_helper.h b/icd/generated/vk_typemap_helper.h index 67844a2e..56aabfff 100644 --- a/icd/generated/vk_typemap_helper.h +++ b/icd/generated/vk_typemap_helper.h @@ -6356,6 +6356,60 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_FEATURES_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceTileShadingFeaturesQCOM Type; +}; + +// Map type VkPhysicalDeviceTileShadingPropertiesQCOM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TILE_SHADING_PROPERTIES_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceTileShadingPropertiesQCOM Type; +}; + +// Map type VkRenderPassTileShadingCreateInfoQCOM to id VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_TILE_SHADING_CREATE_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkRenderPassTileShadingCreateInfoQCOM Type; +}; + +// Map type VkPerTileBeginInfoQCOM to id VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PER_TILE_BEGIN_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPerTileBeginInfoQCOM Type; +}; + +// Map type VkPerTileEndInfoQCOM to id VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PER_TILE_END_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkPerTileEndInfoQCOM Type; +}; + +// Map type VkDispatchTileInfoQCOM to id VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_DISPATCH_TILE_INFO_QCOM; +}; + +template <> struct LvlSTypeMap { + typedef VkDispatchTileInfoQCOM Type; +}; + // Map type VkQueryLowLatencySupportNV to id VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_QUERY_LOW_LATENCY_SUPPORT_NV; @@ -8587,6 +8641,42 @@ template <> struct LvlSTypeMap struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DEVICE_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkExternalComputeQueueDeviceCreateInfoNV Type; +}; + +// Map type VkExternalComputeQueueCreateInfoNV to id VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_CREATE_INFO_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkExternalComputeQueueCreateInfoNV Type; +}; + +// Map type VkExternalComputeQueueDataParamsNV to id VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_COMPUTE_QUEUE_DATA_PARAMS_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkExternalComputeQueueDataParamsNV Type; +}; + +// Map type VkPhysicalDeviceExternalComputeQueuePropertiesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV +template <> struct LvlTypeMap { + static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_COMPUTE_QUEUE_PROPERTIES_NV; +}; + +template <> struct LvlSTypeMap { + typedef VkPhysicalDeviceExternalComputeQueuePropertiesNV Type; +}; + // Map type VkPhysicalDeviceCommandBufferInheritanceFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV template <> struct LvlTypeMap { static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMMAND_BUFFER_INHERITANCE_FEATURES_NV; diff --git a/scripts/known_good.json b/scripts/known_good.json index 8186eaa0..7b5b36a6 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.311" + "commit": "v1.4.312" }, { "name": "MoltenVK", @@ -74,7 +74,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.4.311", + "commit": "v1.4.312", "build_platforms": [ "windows", "linux", -- cgit v1.2.3