summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-10-05 20:06:05 -0700
committerJason Ekstrand <[email protected]>2015-10-05 20:06:30 -0700
commit39a19e88a3e0b5ded30c27b61b85d09f605af8f6 (patch)
tree3badead46f66411273d58f3b9c1e9cf4880e44d4 /include
parent935706234855e19e17402ee3b3cc19bc032b4932 (diff)
vulkan.h: Various cosmetic changes
These don't affect the driver in any way.
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vulkan.h31
1 files changed, 14 insertions, 17 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 44d5fe0e3e3..97902309020 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -878,11 +878,6 @@ typedef enum {
VK_MEMORY_HEAP_HOST_LOCAL = 0x00000001,
} VkMemoryHeapFlagBits;
typedef VkFlags VkMemoryHeapFlags;
-
-typedef enum {
- VK_DEVICE_CREATE_VALIDATION_BIT = 0x00000001,
-} VkDeviceCreateFlagBits;
-typedef VkFlags VkDeviceCreateFlags;
typedef VkFlags VkMemoryMapFlags;
typedef enum {
@@ -1080,16 +1075,6 @@ typedef enum {
} VkQueryControlFlagBits;
typedef VkFlags VkQueryControlFlags;
-typedef struct {
- VkStructureType sType;
- const void* pNext;
- const char* pAppName;
- uint32_t appVersion;
- const char* pEngineName;
- uint32_t engineVersion;
- uint32_t apiVersion;
-} VkApplicationInfo;
-
typedef void* (VKAPI *PFN_vkAllocFunction)(
void* pUserData,
size_t size,
@@ -1100,6 +1085,18 @@ typedef void (VKAPI *PFN_vkFreeFunction)(
void* pUserData,
void* pMem);
+typedef void (VKAPI *PFN_vkVoidFunction)(void);
+
+typedef struct {
+ VkStructureType sType;
+ const void* pNext;
+ const char* pAppName;
+ uint32_t appVersion;
+ const char* pEngineName;
+ uint32_t engineVersion;
+ uint32_t apiVersion;
+} VkApplicationInfo;
+
typedef struct {
void* pUserData;
PFN_vkAllocFunction pfnAlloc;
@@ -1316,8 +1313,9 @@ typedef struct {
VkMemoryHeap memoryHeaps[VK_MAX_MEMORY_HEAPS];
} VkPhysicalDeviceMemoryProperties;
-typedef void (VKAPI *PFN_vkVoidFunction)(void);
typedef struct {
+ VkStructureType sType;
+ const void* pNext;
uint32_t queueFamilyIndex;
uint32_t queueCount;
} VkDeviceQueueCreateInfo;
@@ -1332,7 +1330,6 @@ typedef struct {
uint32_t extensionCount;
const char*const* ppEnabledExtensionNames;
const VkPhysicalDeviceFeatures* pEnabledFeatures;
- VkDeviceCreateFlags flags;
} VkDeviceCreateInfo;
typedef struct {