diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 19:40:27 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-10-30 20:49:24 +0800 |
| commit | 450dd2c719e95b17fa60b29d6290ddf5809fd7c6 (patch) | |
| tree | 7f4b5dd1b343a595a6081e15f1db9d9a5d7172af /include | |
| parent | 32c0bbcb2693a5cbe5641ed7faa056bb06e8b47b (diff) | |
| download | usermoji-450dd2c719e95b17fa60b29d6290ddf5809fd7c6.tar.xz | |
bug 14868: Replace VkTimestampType with VkPipelineStageFlagBits (WIP)
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14868
Diffstat (limited to 'include')
| -rw-r--r-- | include/vulkan.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/vulkan.h b/include/vulkan.h index ae47f6fd..1a7acaa2 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -772,15 +772,6 @@ typedef enum { } VkIndexType; typedef enum { - VK_TIMESTAMP_TYPE_TOP = 0, - VK_TIMESTAMP_TYPE_BOTTOM = 1, - VK_TIMESTAMP_TYPE_BEGIN_RANGE = VK_TIMESTAMP_TYPE_TOP, - VK_TIMESTAMP_TYPE_END_RANGE = VK_TIMESTAMP_TYPE_BOTTOM, - VK_TIMESTAMP_TYPE_NUM = (VK_TIMESTAMP_TYPE_BOTTOM - VK_TIMESTAMP_TYPE_TOP + 1), - VK_TIMESTAMP_TYPE_MAX_ENUM = 0x7FFFFFFF -} VkTimestampType; - -typedef enum { VK_RENDER_PASS_CONTENTS_INLINE = 0, VK_RENDER_PASS_CONTENTS_SECONDARY_CMD_BUFFERS = 1, VK_RENDER_PASS_CONTENTS_BEGIN_RANGE = VK_RENDER_PASS_CONTENTS_INLINE, @@ -2218,7 +2209,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, VkTimestampType timestampType, VkBuffer destBuffer, VkDeviceSize destOffset); +typedef void (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer destBuffer, VkDeviceSize destOffset); 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); @@ -2961,7 +2952,7 @@ void VKAPI vkCmdResetQueryPool( void VKAPI vkCmdWriteTimestamp( VkCmdBuffer cmdBuffer, - VkTimestampType timestampType, + VkPipelineStageFlagBits pipelineStage, VkBuffer destBuffer, VkDeviceSize destOffset); |