summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2015-12-09 11:55:36 -0800
committerJason Ekstrand <jason.ekstrand@intel.com>2015-12-09 11:55:38 -0800
commit46bcf9d777c4d7cfb42757d9bc01a519749ac0c9 (patch)
tree17e1e7e978329d1a114899b1877876b176261634 /include
parent47e5fb52f436a4633db6b9df41a9fd43656cd2bc (diff)
vulkan: Pull in the 0.210.1 vk_platform header
Somehow this got missed in the API update.
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vk_platform.h38
1 files changed, 25 insertions, 13 deletions
diff --git a/include/vulkan/vk_platform.h b/include/vulkan/vk_platform.h
index 0f15167f74..a53e725a9a 100644
--- a/include/vulkan/vk_platform.h
+++ b/include/vulkan/vk_platform.h
@@ -92,24 +92,36 @@ extern "C"
#endif
#endif // !defined(VK_NO_STDINT_H)
-typedef uint64_t VkDeviceSize;
-typedef uint32_t VkBool32;
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
-typedef uint32_t VkSampleMask;
-typedef uint32_t VkFlags;
+// Platform-specific headers required by platform window system extensions.
+// These are enabled prior to #including "vulkan.h". The same enable then
+// controls inclusion of the extension interfaces in vulkan.h.
-#if (UINTPTR_MAX >= UINT64_MAX)
- #define VK_UINTPTRLEAST64_MAX UINTPTR_MAX
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+#include <android/native_window.h>
+#endif
- typedef uintptr_t VkUintPtrLeast64;
-#else
- #define VK_UINTPTRLEAST64_MAX UINT64_MAX
+#ifdef VK_USE_PLATFORM_MIR_KHR
+#include <mir_toolkit/client_types.h>
+#endif
- typedef uint64_t VkUintPtrLeast64;
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#include <wayland-client.h>
#endif
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+#include <windows.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+#include <X11/Xlib.h>
+#endif
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+#include <xcb/xcb.h>
+#endif
#endif // __VK_PLATFORM_H__