summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2015-07-13 13:06:53 -0700
committerChad Versace <[email protected]>2015-07-13 13:06:53 -0700
commitf1cf55fae601436233f942292d689f9c5c9fb03b (patch)
tree645f4c025139e2b29ff49ddb094361504244c486 /include
parent31120987766092321a61681bfb842543620ec725 (diff)
vk/0.132: Move VkWaitEvent
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vulkan.h20
1 files 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,
@@ -854,15 +865,6 @@ typedef enum {
} 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,
VK_TIMESTAMP_TYPE_BEGIN_RANGE = VK_TIMESTAMP_TYPE_TOP,