v149: Fix header ordering bug
diff --git a/include/vulkan.h b/include/vulkan.h
index 005a700..6c6a9e4 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -41,7 +41,7 @@
((major << 22) | (minor << 12) | patch)
// Vulkan API version supported by this file
-#define VK_API_VERSION VK_MAKE_VERSION(0, 148, 0)
+#define VK_API_VERSION VK_MAKE_VERSION(0, 149, 0)
#define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj;
@@ -76,21 +76,10 @@
-#define VK_LOD_CLAMP_NONE 1000.0f
-#define VK_LAST_MIP_LEVEL (~0U)
-#define VK_LAST_ARRAY_SLICE (~0U)
-#define VK_WHOLE_SIZE (~0U)
-#define VK_ATTACHMENT_UNUSED (~0U)
-#define VK_TRUE 1
-#define VK_FALSE 0
-#define VK_NULL_HANDLE 0
-#define VK_QUEUE_FAMILY_IGNORED (~0U)
-#define VK_MAX_PHYSICAL_DEVICE_NAME 256
-#define VK_UUID_LENGTH 16
-#define VK_MAX_MEMORY_TYPES 32
-#define VK_MAX_MEMORY_HEAPS 16
-#define VK_MAX_EXTENSION_NAME 256
-#define VK_MAX_DESCRIPTION 256
+typedef uint32_t VkBool32;
+typedef uint32_t VkFlags;
+typedef uint64_t VkDeviceSize;
+typedef uint32_t VkSampleMask;
VK_DEFINE_HANDLE(VkInstance)
VK_DEFINE_HANDLE(VkPhysicalDevice)
@@ -124,6 +113,22 @@
VK_DEFINE_NONDISP_HANDLE(VkFramebuffer)
VK_DEFINE_NONDISP_HANDLE(VkCmdPool)
+#define VK_LOD_CLAMP_NONE 1000.0f
+#define VK_LAST_MIP_LEVEL (~0U)
+#define VK_LAST_ARRAY_SLICE (~0U)
+#define VK_WHOLE_SIZE (~0ULL)
+#define VK_ATTACHMENT_UNUSED (~0U)
+#define VK_TRUE 1
+#define VK_FALSE 0
+#define VK_NULL_HANDLE 0
+#define VK_QUEUE_FAMILY_IGNORED (~0U)
+#define VK_MAX_PHYSICAL_DEVICE_NAME 256
+#define VK_UUID_LENGTH 16
+#define VK_MAX_MEMORY_TYPES 32
+#define VK_MAX_MEMORY_HEAPS 16
+#define VK_MAX_EXTENSION_NAME 256
+#define VK_MAX_DESCRIPTION 256
+
typedef enum {
VK_SUCCESS = 0,
@@ -837,7 +842,7 @@
VK_RENDER_PASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF
} VkRenderPassContents;
-typedef uint32_t VkFlags;
+
typedef enum {
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT = 0x00000001,
VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT = 0x00000002,
@@ -889,7 +894,6 @@
VK_MEMORY_HEAP_HOST_LOCAL = 0x00000001,
} VkMemoryHeapFlagBits;
typedef VkFlags VkMemoryHeapFlags;
-
typedef VkFlags VkMemoryMapFlags;
typedef enum {
@@ -1088,16 +1092,6 @@
} 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,
@@ -1108,6 +1102,18 @@
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;
@@ -1125,7 +1131,6 @@
const char*const* ppEnabledExtensionNames;
} VkInstanceCreateInfo;
-typedef uint32_t VkBool32;
typedef struct {
VkBool32 robustBufferAccess;
VkBool32 fullDrawIndexUint32;
@@ -1195,7 +1200,6 @@
uint32_t maxSamples;
} VkImageFormatProperties;
-typedef uint64_t VkDeviceSize;
typedef struct {
uint32_t maxImageDimension1D;
uint32_t maxImageDimension2D;
@@ -1324,7 +1328,6 @@
VkMemoryHeap memoryHeaps[VK_MAX_MEMORY_HEAPS];
} VkPhysicalDeviceMemoryProperties;
-typedef void (VKAPI *PFN_vkVoidFunction)(void);
typedef struct {
uint32_t queueFamilyIndex;
uint32_t queueCount;
@@ -1627,7 +1630,6 @@
VkFrontFace frontFace;
} VkPipelineRasterStateCreateInfo;
-typedef uint32_t VkSampleMask;
typedef struct {
VkStructureType sType;
const void* pNext;
diff --git a/vk_helper.py b/vk_helper.py
index 6ffa482..41f31a6 100755
--- a/vk_helper.py
+++ b/vk_helper.py
@@ -152,10 +152,12 @@
continue
(ty_txt, st_txt, base_type) = line.strip().split(None, 2)
#print("Found STRUCT type: %s" % base_type)
- if '{' == base_type:
+ # Note: This really needs to be updated to handle one line struct definition, like
+ # typedef struct obj##_T { uint64_t handle; } obj;
+ if ('{' == base_type or not (' ' in base_type)):
base_type = 'tmp_struct'
- parse_struct = True
- self.types_dict[base_type] = 'struct'
+ parse_struct = True
+ self.types_dict[base_type] = 'struct'
# elif 'typedef union' in line:
# (ty_txt, st_txt, base_type) = line.strip().split(None, 2)
# print("Found UNION type: %s" % base_type)