From c84f2d3b8c589afde896f3e2f55ce33d909b46da Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 8 Jul 2015 10:49:43 -0700 Subject: [PATCH] vk/vulkan.h: Import the VkPipeEvent enum from 130 Now, VkPipeEventFlags is back in sync with VkPipeEvent --- include/vulkan/vulkan.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 6108626fed1..8d4c6a15250 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -848,17 +848,18 @@ typedef enum { } VkIndexType; typedef enum { - VK_PIPE_EVENT_TOP_OF_PIPE = 1, - VK_PIPE_EVENT_VERTEX_PROCESSING_COMPLETE = 2, - VK_PIPE_EVENT_LOCAL_FRAGMENT_PROCESSING_COMPLETE = 3, - VK_PIPE_EVENT_FRAGMENT_PROCESSING_COMPLETE = 4, - VK_PIPE_EVENT_GRAPHICS_PIPELINE_COMPLETE = 5, - VK_PIPE_EVENT_COMPUTE_PIPELINE_COMPLETE = 6, - VK_PIPE_EVENT_TRANSFER_COMPLETE = 7, - VK_PIPE_EVENT_COMMANDS_COMPLETE = 8, + VK_PIPE_EVENT_TOP_OF_PIPE = 0, + VK_PIPE_EVENT_VERTEX_PROCESSING_COMPLETE = 1, + VK_PIPE_EVENT_LOCAL_FRAGMENT_PROCESSING_COMPLETE = 2, + VK_PIPE_EVENT_FRAGMENT_PROCESSING_COMPLETE = 3, + VK_PIPE_EVENT_GRAPHICS_PIPELINE_COMPLETE = 4, + VK_PIPE_EVENT_COMPUTE_PIPELINE_COMPLETE = 5, + VK_PIPE_EVENT_TRANSFER_COMPLETE = 6, + VK_PIPE_EVENT_COMMANDS_COMPLETE = 7, + VK_PIPE_EVENT_CPU_SIGNAL = 8, VK_PIPE_EVENT_BEGIN_RANGE = VK_PIPE_EVENT_TOP_OF_PIPE, - VK_PIPE_EVENT_END_RANGE = VK_PIPE_EVENT_COMMANDS_COMPLETE, - VK_PIPE_EVENT_NUM = (VK_PIPE_EVENT_COMMANDS_COMPLETE - VK_PIPE_EVENT_TOP_OF_PIPE + 1), + VK_PIPE_EVENT_END_RANGE = VK_PIPE_EVENT_CPU_SIGNAL, + VK_PIPE_EVENT_NUM = (VK_PIPE_EVENT_CPU_SIGNAL - VK_PIPE_EVENT_TOP_OF_PIPE + 1), VK_PIPE_EVENT_MAX_ENUM = 0x7FFFFFFF } VkPipeEvent; -- 2.30.2