Skip to content

Commit

Permalink
Update to latest Vulkan-Headers
Browse files Browse the repository at this point in the history
  • Loading branch information
charles-lunarg committed May 17, 2022
1 parent 2912c74 commit 8f39b12
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 3 deletions.
4 changes: 2 additions & 2 deletions gen/CurrentBuildVulkanVersion.cmake
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION 1.3.212)
set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG v1.3.212)
set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION 1.3.213)
set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG v1.3.213)
35 changes: 34 additions & 1 deletion src/VkBootstrapDispatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,9 @@ struct DispatchTable {
#if (defined(VK_KHR_ray_tracing_pipeline))
fp_vkCmdTraceRaysIndirectKHR = reinterpret_cast<PFN_vkCmdTraceRaysIndirectKHR>(procAddr(device, "vkCmdTraceRaysIndirectKHR"));
#endif
#if (defined(VK_KHR_ray_tracing_maintenance1) && defined(VK_KHR_ray_tracing_pipeline))
fp_vkCmdTraceRaysIndirect2KHR = reinterpret_cast<PFN_vkCmdTraceRaysIndirect2KHR>(procAddr(device, "vkCmdTraceRaysIndirect2KHR"));
#endif
#if (defined(VK_KHR_acceleration_structure))
fp_vkGetDeviceAccelerationStructureCompatibilityKHR = reinterpret_cast<PFN_vkGetDeviceAccelerationStructureCompatibilityKHR>(procAddr(device, "vkGetDeviceAccelerationStructureCompatibilityKHR"));
#endif
Expand Down Expand Up @@ -892,6 +895,12 @@ struct DispatchTable {
#if (defined(VK_VALVE_descriptor_set_host_mapping))
fp_vkGetDescriptorSetHostMappingVALVE = reinterpret_cast<PFN_vkGetDescriptorSetHostMappingVALVE>(procAddr(device, "vkGetDescriptorSetHostMappingVALVE"));
#endif
#if (defined(VK_EXT_image_compression_control))
fp_vkGetImageSubresourceLayout2EXT = reinterpret_cast<PFN_vkGetImageSubresourceLayout2EXT>(procAddr(device, "vkGetImageSubresourceLayout2EXT"));
#endif
#if (defined(VK_EXT_pipeline_properties))
fp_vkGetPipelinePropertiesEXT = reinterpret_cast<PFN_vkGetPipelinePropertiesEXT>(procAddr(device, "vkGetPipelinePropertiesEXT"));
#endif
#if (defined(VK_EXT_host_query_reset))
fp_vkResetQueryPoolEXT = reinterpret_cast<PFN_vkResetQueryPoolEXT>(procAddr(device, "vkResetQueryPoolEXT"));
#endif
Expand Down Expand Up @@ -2195,6 +2204,11 @@ struct DispatchTable {
fp_vkCmdTraceRaysIndirectKHR(commandBuffer, pRaygenShaderBindingTable, pMissShaderBindingTable, pHitShaderBindingTable, pCallableShaderBindingTable, indirectDeviceAddress);
}
#endif
#if (defined(VK_KHR_ray_tracing_maintenance1) && defined(VK_KHR_ray_tracing_pipeline))
void cmdTraceRaysIndirect2KHR(VkCommandBuffer commandBuffer, VkDeviceAddress indirectDeviceAddress) const noexcept {
fp_vkCmdTraceRaysIndirect2KHR(commandBuffer, indirectDeviceAddress);
}
#endif
#if (defined(VK_KHR_acceleration_structure))
void getDeviceAccelerationStructureCompatibilityKHR(const VkAccelerationStructureVersionInfoKHR* pVersionInfo, VkAccelerationStructureCompatibilityKHR* pCompatibility) const noexcept {
fp_vkGetDeviceAccelerationStructureCompatibilityKHR(device, pVersionInfo, pCompatibility);
Expand Down Expand Up @@ -2301,7 +2315,7 @@ struct DispatchTable {
}
#endif
#if (defined(VK_KHR_pipeline_executable_properties))
VkResult getPipelineExecutablePropertiesKHR(const VkPipelineInfoKHR* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const noexcept {
VkResult getPipelineExecutablePropertiesKHR(const VkPipelineInfoEXT* pPipelineInfo, uint32_t* pExecutableCount, VkPipelineExecutablePropertiesKHR* pProperties) const noexcept {
return fp_vkGetPipelineExecutablePropertiesKHR(device, pPipelineInfo, pExecutableCount, pProperties);
}
#endif
Expand Down Expand Up @@ -2685,6 +2699,16 @@ struct DispatchTable {
fp_vkGetDescriptorSetHostMappingVALVE(device, descriptorSet, ppData);
}
#endif
#if (defined(VK_EXT_image_compression_control))
void getImageSubresourceLayout2EXT(VkImage image, const VkImageSubresource2EXT* pSubresource, VkSubresourceLayout2EXT* pLayout) const noexcept {
fp_vkGetImageSubresourceLayout2EXT(device, image, pSubresource, pLayout);
}
#endif
#if (defined(VK_EXT_pipeline_properties))
VkResult getPipelinePropertiesEXT(const VkPipelineInfoEXT* pPipelineInfo, VkBaseOutStructure* pPipelineProperties) const noexcept {
return fp_vkGetPipelinePropertiesEXT(device, pPipelineInfo, pPipelineProperties);
}
#endif
#if (defined(VK_EXT_host_query_reset))
void resetQueryPoolEXT(VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) const noexcept {
fp_vkResetQueryPoolEXT(device, queryPool, firstQuery, queryCount);
Expand Down Expand Up @@ -3579,6 +3603,9 @@ struct DispatchTable {
#if (defined(VK_KHR_ray_tracing_pipeline))
PFN_vkCmdTraceRaysIndirectKHR fp_vkCmdTraceRaysIndirectKHR = nullptr;
#endif
#if (defined(VK_KHR_ray_tracing_maintenance1) && defined(VK_KHR_ray_tracing_pipeline))
PFN_vkCmdTraceRaysIndirect2KHR fp_vkCmdTraceRaysIndirect2KHR = nullptr;
#endif
#if (defined(VK_KHR_acceleration_structure))
PFN_vkGetDeviceAccelerationStructureCompatibilityKHR fp_vkGetDeviceAccelerationStructureCompatibilityKHR = nullptr;
#endif
Expand Down Expand Up @@ -3873,6 +3900,12 @@ struct DispatchTable {
#if (defined(VK_VALVE_descriptor_set_host_mapping))
PFN_vkGetDescriptorSetHostMappingVALVE fp_vkGetDescriptorSetHostMappingVALVE = nullptr;
#endif
#if (defined(VK_EXT_image_compression_control))
PFN_vkGetImageSubresourceLayout2EXT fp_vkGetImageSubresourceLayout2EXT = nullptr;
#endif
#if (defined(VK_EXT_pipeline_properties))
PFN_vkGetPipelinePropertiesEXT fp_vkGetPipelinePropertiesEXT = nullptr;
#endif
#if (defined(VK_EXT_host_query_reset))
PFN_vkResetQueryPoolEXT fp_vkResetQueryPoolEXT = nullptr;
#endif
Expand Down

0 comments on commit 8f39b12

Please sign in to comment.