From f8259b0718af105bbd0764145564558d38a640ec Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 11 Oct 2024 09:54:05 -0700 Subject: build: Update to header 1.3.298 --- icd/VkICD_mock_icd.json.in | 2 +- icd/generated/function_declarations.h | 9 +++++++-- icd/generated/function_definitions.h | 7 ++++++- scripts/known_good.json | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/icd/VkICD_mock_icd.json.in b/icd/VkICD_mock_icd.json.in index aa84fed4..e7d69739 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.3.297" + "api_version": "1.3.298" } } \ No newline at end of file diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index d7139ec7..22738e68 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -158,7 +158,7 @@ static const std::unordered_map device_extension_map = { {"VK_EXT_sampler_filter_minmax", 2}, {"VK_KHR_storage_buffer_storage_class", 1}, {"VK_AMD_gpu_shader_int16", 2}, - {"VK_AMDX_shader_enqueue", 1}, + {"VK_AMDX_shader_enqueue", 2}, {"VK_AMD_mixed_attachment_samples", 1}, {"VK_AMD_shader_fragment_mask", 1}, {"VK_EXT_inline_uniform_block", 1}, @@ -3031,21 +3031,26 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetExecutionGraphPipelineNodeIndexAMDX( static VKAPI_ATTR void VKAPI_CALL CmdInitializeGraphScratchMemoryAMDX( VkCommandBuffer commandBuffer, - VkDeviceAddress scratch); + VkPipeline executionGraph, + VkDeviceAddress scratch, + VkDeviceSize scratchSize); static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, + VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo); static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, + VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo); static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectCountAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, + VkDeviceSize scratchSize, VkDeviceAddress countInfo); #endif /* VK_ENABLE_BETA_EXTENSIONS */ diff --git a/icd/generated/function_definitions.h b/icd/generated/function_definitions.h index 9cde3184..11c645c6 100644 --- a/icd/generated/function_definitions.h +++ b/icd/generated/function_definitions.h @@ -5511,7 +5511,9 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetExecutionGraphPipelineNodeIndexAMDX( static VKAPI_ATTR void VKAPI_CALL CmdInitializeGraphScratchMemoryAMDX( VkCommandBuffer commandBuffer, - VkDeviceAddress scratch) + VkPipeline executionGraph, + VkDeviceAddress scratch, + VkDeviceSize scratchSize) { //Not a CREATE or DESTROY function } @@ -5519,6 +5521,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdInitializeGraphScratchMemoryAMDX( static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, + VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo) { //Not a CREATE or DESTROY function @@ -5527,6 +5530,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphAMDX( static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, + VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo) { //Not a CREATE or DESTROY function @@ -5535,6 +5539,7 @@ static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectAMDX( static VKAPI_ATTR void VKAPI_CALL CmdDispatchGraphIndirectCountAMDX( VkCommandBuffer commandBuffer, VkDeviceAddress scratch, + VkDeviceSize scratchSize, VkDeviceAddress countInfo) { //Not a CREATE or DESTROY function diff --git a/scripts/known_good.json b/scripts/known_good.json index 2cea7291..cc4cb66a 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.297" + "commit": "v1.3.298" }, { "name": "MoltenVK", @@ -74,7 +74,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.3.297", + "commit": "v1.3.298", "build_platforms": [ "windows", "linux", @@ -95,4 +95,4 @@ "googletest": "GOOGLETEST_INSTALL_DIR", "Vulkan-Loader": "VULKAN_LOADER_INSTALL_DIR" } -} +} \ No newline at end of file -- cgit v1.2.3