summaryrefslogtreecommitdiffstats
path: root/include/vulkan
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2015-07-13 13:09:32 -0700
committerChad Versace <[email protected]>2015-07-13 13:09:32 -0700
commit45f8723f448859a48d51fc3d5a555d4bc7a4eeb9 (patch)
treefe98a5949bef0725393525d7f438e878f1a5f5c5 /include/vulkan
parent180c07ee50ec3e5b044ffbe9571fe4348af50e48 (diff)
vk/0.132: Move VkQueryControlFlags
Diffstat (limited to 'include/vulkan')
-rw-r--r--include/vulkan/vulkan.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 6abaf086aef..9f0b438f02e 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1045,11 +1045,6 @@ typedef enum {
typedef VkFlags VkPipeEventFlags;
typedef enum {
- VK_QUERY_CONTROL_CONSERVATIVE_BIT = 0x00000001,
-} VkQueryControlFlagBits;
-typedef VkFlags VkQueryControlFlags;
-
-typedef enum {
VK_MEMORY_OUTPUT_HOST_WRITE_BIT = 0x00000001,
VK_MEMORY_OUTPUT_SHADER_WRITE_BIT = 0x00000002,
VK_MEMORY_OUTPUT_COLOR_ATTACHMENT_BIT = 0x00000004,
@@ -1088,6 +1083,11 @@ typedef enum {
} VkImageAspectFlagBits;
typedef VkFlags VkImageAspectFlags;
+typedef enum {
+ VK_QUERY_CONTROL_CONSERVATIVE_BIT = 0x00000001,
+} VkQueryControlFlagBits;
+typedef VkFlags VkQueryControlFlags;
+
typedef struct {
VkStructureType sType;
const void* pNext;