Index: include/gpu/vk/GrVkDefines.h |
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h |
index 7ff81c84f912a78086f4aa6681af00257d16f51e..7f4b59dccfb7a4f28703bdf8882348aae616d6f9 100644 |
--- a/include/gpu/vk/GrVkDefines.h |
+++ b/include/gpu/vk/GrVkDefines.h |
@@ -10,13 +10,32 @@ |
#define GrVkDefines_DEFINED |
#if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_WIN32) |
-#define VK_USE_PLATFORM_WIN32_KHR |
+# define VK_USE_PLATFORM_WIN32_KHR |
#elif defined(SK_BUILD_FOR_ANDROID) |
-#define VK_USE_PLATFORM_ANDROID_KHR |
+# define VK_USE_PLATFORM_ANDROID_KHR |
#elif defined(SK_BUILD_FOR_UNIX) |
-#define VK_USE_PLATFORM_XLIB_KHR |
+# define VK_USE_PLATFORM_XLIB_KHR |
+#endif |
+ |
+#if defined(Bool) || defined(Status) || defined(True) || defined(False) |
+# pragma error "Macros unexpectedly defined." |
#endif |
#include <vulkan/vulkan.h> |
+ |
+// Xlib.h may define these macros with common names (Grrr) |
+#ifdef Bool |
+# undef Bool |
+#endif |
+#ifdef Status |
+# undef Status |
+#endif |
+#ifdef True |
+# undef True |
+#endif |
+#ifdef False |
+# undef False |
+#endif |
+ |
#endif |