From 46bcf9d777c4d7cfb42757d9bc01a519749ac0c9 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 9 Dec 2015 11:55:36 -0800 Subject: [PATCH] vulkan: Pull in the 0.210.1 vk_platform header Somehow this got missed in the API update. --- include/vulkan/vk_platform.h | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/include/vulkan/vk_platform.h b/include/vulkan/vk_platform.h index 0f15167f742..a53e725a9a6 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 +#endif - typedef uintptr_t VkUintPtrLeast64; -#else - #define VK_UINTPTRLEAST64_MAX UINT64_MAX +#ifdef VK_USE_PLATFORM_MIR_KHR +#include +#endif - typedef uint64_t VkUintPtrLeast64; +#ifdef VK_USE_PLATFORM_WAYLAND_KHR +#include #endif -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus +#ifdef VK_USE_PLATFORM_WIN32_KHR +#include +#endif + +#ifdef VK_USE_PLATFORM_XLIB_KHR +#include +#endif + +#ifdef VK_USE_PLATFORM_XCB_KHR +#include +#endif #endif // __VK_PLATFORM_H__ -- 2.30.2