From f1cf55fae601436233f942292d689f9c5c9fb03b Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Mon, 13 Jul 2015 13:06:53 -0700 Subject: [PATCH] vk/0.132: Move VkWaitEvent --- include/vulkan/vulkan.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index cda452e14fb..3ae35857505 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -809,6 +809,17 @@ typedef enum { VK_PIPELINE_BIND_POINT_NUM = (VK_PIPELINE_BIND_POINT_GRAPHICS - VK_PIPELINE_BIND_POINT_COMPUTE + 1), VK_PIPELINE_BIND_POINT_MAX_ENUM = 0x7FFFFFFF } VkPipelineBindPoint; + +typedef enum { + VK_WAIT_EVENT_TOP_OF_PIPE = 1, + VK_WAIT_EVENT_BEFORE_RASTERIZATION = 2, + VK_WAIT_EVENT_BEGIN_RANGE = VK_WAIT_EVENT_TOP_OF_PIPE, + VK_WAIT_EVENT_END_RANGE = VK_WAIT_EVENT_BEFORE_RASTERIZATION, + VK_WAIT_EVENT_NUM = (VK_WAIT_EVENT_BEFORE_RASTERIZATION - VK_WAIT_EVENT_TOP_OF_PIPE + 1), + VK_WAIT_EVENT_MAX_ENUM = 0x7FFFFFFF +} VkWaitEvent; + +typedef enum { VK_CMD_BUFFER_LEVEL_PRIMARY = 0, VK_CMD_BUFFER_LEVEL_SECONDARY = 1, VK_CMD_BUFFER_LEVEL_BEGIN_RANGE = VK_CMD_BUFFER_LEVEL_PRIMARY, @@ -853,15 +864,6 @@ typedef enum { VK_PIPE_EVENT_MAX_ENUM = 0x7FFFFFFF } VkPipeEvent; -typedef enum { - VK_WAIT_EVENT_TOP_OF_PIPE = 1, - VK_WAIT_EVENT_BEFORE_RASTERIZATION = 2, - VK_WAIT_EVENT_BEGIN_RANGE = VK_WAIT_EVENT_TOP_OF_PIPE, - VK_WAIT_EVENT_END_RANGE = VK_WAIT_EVENT_BEFORE_RASTERIZATION, - VK_WAIT_EVENT_NUM = (VK_WAIT_EVENT_BEFORE_RASTERIZATION - VK_WAIT_EVENT_TOP_OF_PIPE + 1), - VK_WAIT_EVENT_MAX_ENUM = 0x7FFFFFFF -} VkWaitEvent; - typedef enum { VK_TIMESTAMP_TYPE_TOP = 0, VK_TIMESTAMP_TYPE_BOTTOM = 1, -- 2.30.2