aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2015-10-26 20:14:54 +0800
committerChia-I Wu <olv@lunarg.com>2015-10-30 20:49:24 +0800
commitef79bc8e5a81cc33257f1192e341cbea8d83ab7a (patch)
treefab671f4695bb7a4c10761bb979fd69c5feb3d2e /include
parent1c4086aa360cad856d5f5e94779121ddb870cad6 (diff)
downloadusermoji-ef79bc8e5a81cc33257f1192e341cbea8d83ab7a.tar.xz
bug 14876: Can timestamps be written inside a renderpass? (WIP)
Timestamps are written to a query pool. https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14876
Diffstat (limited to 'include')
-rw-r--r--include/vulkan.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/vulkan.h b/include/vulkan.h
index e17207b3..514c118d 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -412,9 +412,10 @@ typedef enum {
typedef enum {
VK_QUERY_TYPE_OCCLUSION = 0,
VK_QUERY_TYPE_PIPELINE_STATISTICS = 1,
+ VK_QUERY_TYPE_TIMESTAMP = 2,
VK_QUERY_TYPE_BEGIN_RANGE = VK_QUERY_TYPE_OCCLUSION,
- VK_QUERY_TYPE_END_RANGE = VK_QUERY_TYPE_PIPELINE_STATISTICS,
- VK_QUERY_TYPE_NUM = (VK_QUERY_TYPE_PIPELINE_STATISTICS - VK_QUERY_TYPE_OCCLUSION + 1),
+ VK_QUERY_TYPE_END_RANGE = VK_QUERY_TYPE_TIMESTAMP,
+ VK_QUERY_TYPE_NUM = (VK_QUERY_TYPE_TIMESTAMP - VK_QUERY_TYPE_OCCLUSION + 1),
VK_QUERY_TYPE_MAX_ENUM = 0x7FFFFFFF
} VkQueryType;
@@ -2177,7 +2178,7 @@ typedef void (VKAPI *PFN_vkCmdPipelineBarrier)(VkCmdBuffer cmdBuffer, VkPipeline
typedef void (VKAPI *PFN_vkCmdBeginQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkQueryControlFlags flags);
typedef void (VKAPI *PFN_vkCmdEndQuery)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot);
typedef void (VKAPI *PFN_vkCmdResetQueryPool)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount);
-typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer destBuffer, VkDeviceSize destOffset);
+typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot);
typedef void (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize stride, VkQueryResultFlags flags);
typedef void (VKAPI *PFN_vkCmdPushConstants)(VkCmdBuffer cmdBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t start, uint32_t length, const void* values);
typedef void (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, VkRenderPassContents contents);
@@ -2913,8 +2914,8 @@ void VKAPI vkCmdResetQueryPool(
void VKAPI vkCmdWriteTimestamp(
VkCmdBuffer cmdBuffer,
VkPipelineStageFlagBits pipelineStage,
- VkBuffer destBuffer,
- VkDeviceSize destOffset);
+ VkQueryPool queryPool,
+ uint32_t slot);
void VKAPI vkCmdCopyQueryPoolResults(
VkCmdBuffer cmdBuffer,