diff --git a/scripts/generate_vk_helpers.py b/scripts/generate_vk_helpers.py index 1e907a1d1..d5a37ec48 100755 --- a/scripts/generate_vk_helpers.py +++ b/scripts/generate_vk_helpers.py @@ -42,11 +42,20 @@ def get_device_cmds(): Cmd("vkCreateShaderModule"), Cmd("vkDestroyShaderModule"), None, + Cmd("vkCreateQueryPool"), + Cmd("vkDestroyQueryPool"), + Cmd("vkGetQueryPoolResults"), + None, Cmd("vkCreateCommandPool"), Cmd("vkDestroyCommandPool"), None, Cmd("vkAllocateCommandBuffers"), Cmd("vkBeginCommandBuffer"), + Cmd("vkCmdBeginQuery"), + Cmd("vkCmdCopyQueryPoolResults"), + Cmd("vkCmdEndQuery"), + Cmd("vkCmdResetQueryPool"), + Cmd("vkCmdWriteTimestamp"), Cmd("vkCmdPipelineBarrier"), Cmd("vkCmdBeginRenderPass"), Cmd("vkCmdSetScissor"), diff --git a/src/xrt/auxiliary/vk/vk_function_loaders.c b/src/xrt/auxiliary/vk/vk_function_loaders.c index 302f00182..838fce20a 100644 --- a/src/xrt/auxiliary/vk/vk_function_loaders.c +++ b/src/xrt/auxiliary/vk/vk_function_loaders.c @@ -172,11 +172,20 @@ vk_get_device_functions(struct vk_bundle *vk) vk->vkCreateShaderModule = GET_DEV_PROC(vk, vkCreateShaderModule); vk->vkDestroyShaderModule = GET_DEV_PROC(vk, vkDestroyShaderModule); + vk->vkCreateQueryPool = GET_DEV_PROC(vk, vkCreateQueryPool); + vk->vkDestroyQueryPool = GET_DEV_PROC(vk, vkDestroyQueryPool); + vk->vkGetQueryPoolResults = GET_DEV_PROC(vk, vkGetQueryPoolResults); + vk->vkCreateCommandPool = GET_DEV_PROC(vk, vkCreateCommandPool); vk->vkDestroyCommandPool = GET_DEV_PROC(vk, vkDestroyCommandPool); vk->vkAllocateCommandBuffers = GET_DEV_PROC(vk, vkAllocateCommandBuffers); vk->vkBeginCommandBuffer = GET_DEV_PROC(vk, vkBeginCommandBuffer); + vk->vkCmdBeginQuery = GET_DEV_PROC(vk, vkCmdBeginQuery); + vk->vkCmdCopyQueryPoolResults = GET_DEV_PROC(vk, vkCmdCopyQueryPoolResults); + vk->vkCmdEndQuery = GET_DEV_PROC(vk, vkCmdEndQuery); + vk->vkCmdResetQueryPool = GET_DEV_PROC(vk, vkCmdResetQueryPool); + vk->vkCmdWriteTimestamp = GET_DEV_PROC(vk, vkCmdWriteTimestamp); vk->vkCmdPipelineBarrier = GET_DEV_PROC(vk, vkCmdPipelineBarrier); vk->vkCmdBeginRenderPass = GET_DEV_PROC(vk, vkCmdBeginRenderPass); vk->vkCmdSetScissor = GET_DEV_PROC(vk, vkCmdSetScissor); diff --git a/src/xrt/auxiliary/vk/vk_helpers.h b/src/xrt/auxiliary/vk/vk_helpers.h index ac9aab8f5..f7e2119c3 100644 --- a/src/xrt/auxiliary/vk/vk_helpers.h +++ b/src/xrt/auxiliary/vk/vk_helpers.h @@ -221,11 +221,20 @@ struct vk_bundle PFN_vkCreateShaderModule vkCreateShaderModule; PFN_vkDestroyShaderModule vkDestroyShaderModule; + PFN_vkCreateQueryPool vkCreateQueryPool; + PFN_vkDestroyQueryPool vkDestroyQueryPool; + PFN_vkGetQueryPoolResults vkGetQueryPoolResults; + PFN_vkCreateCommandPool vkCreateCommandPool; PFN_vkDestroyCommandPool vkDestroyCommandPool; PFN_vkAllocateCommandBuffers vkAllocateCommandBuffers; PFN_vkBeginCommandBuffer vkBeginCommandBuffer; + PFN_vkCmdBeginQuery vkCmdBeginQuery; + PFN_vkCmdCopyQueryPoolResults vkCmdCopyQueryPoolResults; + PFN_vkCmdEndQuery vkCmdEndQuery; + PFN_vkCmdResetQueryPool vkCmdResetQueryPool; + PFN_vkCmdWriteTimestamp vkCmdWriteTimestamp; PFN_vkCmdPipelineBarrier vkCmdPipelineBarrier; PFN_vkCmdBeginRenderPass vkCmdBeginRenderPass; PFN_vkCmdSetScissor vkCmdSetScissor;