From: Chad Versace <chad.versace@intel.com>
Date: Mon, 13 Jul 2015 20:09:32 +0000 (-0700)
Subject: vk/0.132: Move VkQueryControlFlags
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=45f8723f448859a48d51fc3d5a555d4bc7a4eeb9;p=mesa.git

vk/0.132: Move VkQueryControlFlags
---

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
@@ -1044,11 +1044,6 @@ typedef enum {
 } VkPipeEventFlagBits;
 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,
@@ -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;