mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-22 07:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add AMDX functions to header version workaround list

Browse Source 
Header update 1.3.298 changed the definition of functions. Should have caught
this during the PR review, as well better late than never.
This commit is contained in:
Charles Giessen 2024-10-22 12:43:56 -05:00 committed by Charles Giessen
parent 01018f5ba8
commit 7fcd5d04c4
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/generate_dispatch.py
View File

@ -107,7 +107,11 @@ HEADER_VERSION_WORKAROUNDS = {
'vkGetLatencyTimingsNV': '271', # Changed API parameters 'vkGetLatencyTimingsNV': '271', # Changed API parameters
'vkCmdSetDiscardRectangleEnableEXT': '241', # new function in older extension 'vkCmdSetDiscardRectangleEnableEXT': '241', # new function in older extension
'vkCmdSetDiscardRectangleModeEXT': '241', # new function in older extension 'vkCmdSetDiscardRectangleModeEXT': '241', # new function in older extension
'vkCmdSetExclusiveScissorEnableNV': '241', # new function in older extension 'vkCmdSetExclusiveScissorEnableNV': '241', # Changed API parameters
'vkCmdInitializeGraphScratchMemoryAMDX': '298', # Changed API parameters
'vkCmdDispatchGraphAMDX': '298', # Changed API parameters
'vkCmdDispatchGraphIndirectAMDX': '298', # Changed API parameters
'vkCmdDispatchGraphIndirectCountAMDX': '298', # Changed API parameters
} }
def get_macro_guard(reqs_collection, command_name): def get_macro_guard(reqs_collection, command_name):

24
src/VkBootstrapDispatch.h
View File

@ -2623,16 +2623,16 @@ struct DispatchTable {
#if (defined(VK_AMDX_shader_enqueue)) #if (defined(VK_AMDX_shader_enqueue))
fp_vkCreateExecutionGraphPipelinesAMDX = reinterpret_cast<PFN_vkCreateExecutionGraphPipelinesAMDX>(procAddr(device, "vkCreateExecutionGraphPipelinesAMDX")); fp_vkCreateExecutionGraphPipelinesAMDX = reinterpret_cast<PFN_vkCreateExecutionGraphPipelinesAMDX>(procAddr(device, "vkCreateExecutionGraphPipelinesAMDX"));
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
fp_vkCmdInitializeGraphScratchMemoryAMDX = reinterpret_cast<PFN_vkCmdInitializeGraphScratchMemoryAMDX>(procAddr(device, "vkCmdInitializeGraphScratchMemoryAMDX")); fp_vkCmdInitializeGraphScratchMemoryAMDX = reinterpret_cast<PFN_vkCmdInitializeGraphScratchMemoryAMDX>(procAddr(device, "vkCmdInitializeGraphScratchMemoryAMDX"));
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
fp_vkCmdDispatchGraphAMDX = reinterpret_cast<PFN_vkCmdDispatchGraphAMDX>(procAddr(device, "vkCmdDispatchGraphAMDX")); fp_vkCmdDispatchGraphAMDX = reinterpret_cast<PFN_vkCmdDispatchGraphAMDX>(procAddr(device, "vkCmdDispatchGraphAMDX"));
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
fp_vkCmdDispatchGraphIndirectAMDX = reinterpret_cast<PFN_vkCmdDispatchGraphIndirectAMDX>(procAddr(device, "vkCmdDispatchGraphIndirectAMDX")); fp_vkCmdDispatchGraphIndirectAMDX = reinterpret_cast<PFN_vkCmdDispatchGraphIndirectAMDX>(procAddr(device, "vkCmdDispatchGraphIndirectAMDX"));
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
fp_vkCmdDispatchGraphIndirectCountAMDX = reinterpret_cast<PFN_vkCmdDispatchGraphIndirectCountAMDX>(procAddr(device, "vkCmdDispatchGraphIndirectCountAMDX")); fp_vkCmdDispatchGraphIndirectCountAMDX = reinterpret_cast<PFN_vkCmdDispatchGraphIndirectCountAMDX>(procAddr(device, "vkCmdDispatchGraphIndirectCountAMDX"));
#endif #endif
#if (defined(VK_KHR_maintenance6)) #if (defined(VK_KHR_maintenance6))
@ -5169,22 +5169,22 @@ struct DispatchTable {
return fp_vkCreateExecutionGraphPipelinesAMDX(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines); return fp_vkCreateExecutionGraphPipelinesAMDX(device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines);
} }
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
void cmdInitializeGraphScratchMemoryAMDX(VkCommandBuffer commandBuffer, VkPipeline executionGraph, VkDeviceAddress scratch, VkDeviceSize scratchSize) const noexcept { void cmdInitializeGraphScratchMemoryAMDX(VkCommandBuffer commandBuffer, VkPipeline executionGraph, VkDeviceAddress scratch, VkDeviceSize scratchSize) const noexcept {
fp_vkCmdInitializeGraphScratchMemoryAMDX(commandBuffer, executionGraph, scratch, scratchSize); fp_vkCmdInitializeGraphScratchMemoryAMDX(commandBuffer, executionGraph, scratch, scratchSize);
} }
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
void cmdDispatchGraphAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo) const noexcept { void cmdDispatchGraphAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo) const noexcept {
fp_vkCmdDispatchGraphAMDX(commandBuffer, scratch, scratchSize, pCountInfo); fp_vkCmdDispatchGraphAMDX(commandBuffer, scratch, scratchSize, pCountInfo);
} }
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
void cmdDispatchGraphIndirectAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo) const noexcept { void cmdDispatchGraphIndirectAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceSize scratchSize, const VkDispatchGraphCountInfoAMDX* pCountInfo) const noexcept {
fp_vkCmdDispatchGraphIndirectAMDX(commandBuffer, scratch, scratchSize, pCountInfo); fp_vkCmdDispatchGraphIndirectAMDX(commandBuffer, scratch, scratchSize, pCountInfo);
} }
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
void cmdDispatchGraphIndirectCountAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceSize scratchSize, VkDeviceAddress countInfo) const noexcept { void cmdDispatchGraphIndirectCountAMDX(VkCommandBuffer commandBuffer, VkDeviceAddress scratch, VkDeviceSize scratchSize, VkDeviceAddress countInfo) const noexcept {
fp_vkCmdDispatchGraphIndirectCountAMDX(commandBuffer, scratch, scratchSize, countInfo); fp_vkCmdDispatchGraphIndirectCountAMDX(commandBuffer, scratch, scratchSize, countInfo);
} }
@ -7648,22 +7648,22 @@ struct DispatchTable {
#else #else
void * fp_vkCreateExecutionGraphPipelinesAMDX{}; void * fp_vkCreateExecutionGraphPipelinesAMDX{};
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
PFN_vkCmdInitializeGraphScratchMemoryAMDX fp_vkCmdInitializeGraphScratchMemoryAMDX = nullptr; PFN_vkCmdInitializeGraphScratchMemoryAMDX fp_vkCmdInitializeGraphScratchMemoryAMDX = nullptr;
#else #else
void * fp_vkCmdInitializeGraphScratchMemoryAMDX{}; void * fp_vkCmdInitializeGraphScratchMemoryAMDX{};
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
PFN_vkCmdDispatchGraphAMDX fp_vkCmdDispatchGraphAMDX = nullptr; PFN_vkCmdDispatchGraphAMDX fp_vkCmdDispatchGraphAMDX = nullptr;
#else #else
void * fp_vkCmdDispatchGraphAMDX{}; void * fp_vkCmdDispatchGraphAMDX{};
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
PFN_vkCmdDispatchGraphIndirectAMDX fp_vkCmdDispatchGraphIndirectAMDX = nullptr; PFN_vkCmdDispatchGraphIndirectAMDX fp_vkCmdDispatchGraphIndirectAMDX = nullptr;
#else #else
void * fp_vkCmdDispatchGraphIndirectAMDX{}; void * fp_vkCmdDispatchGraphIndirectAMDX{};
#endif #endif
#if (defined(VK_AMDX_shader_enqueue)) #if ((defined(VK_AMDX_shader_enqueue))) && VK_HEADER_VERSION >= 298
PFN_vkCmdDispatchGraphIndirectCountAMDX fp_vkCmdDispatchGraphIndirectCountAMDX = nullptr; PFN_vkCmdDispatchGraphIndirectCountAMDX fp_vkCmdDispatchGraphIndirectCountAMDX = nullptr;
#else #else
void * fp_vkCmdDispatchGraphIndirectCountAMDX{}; void * fp_vkCmdDispatchGraphIndirectCountAMDX{};