Index: include/gpu/vk/GrVkDefines.h |
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h |
index 7f4b59dccfb7a4f28703bdf8882348aae616d6f9..9caf2d75e524e4da71e93045fc94377f5a75553c 100644 |
--- a/include/gpu/vk/GrVkDefines.h |
+++ b/include/gpu/vk/GrVkDefines.h |
@@ -14,7 +14,7 @@ |
#elif defined(SK_BUILD_FOR_ANDROID) |
# define VK_USE_PLATFORM_ANDROID_KHR |
#elif defined(SK_BUILD_FOR_UNIX) |
-# define VK_USE_PLATFORM_XLIB_KHR |
+# define VK_USE_PLATFORM_XCB_KHR |
#endif |
#if defined(Bool) || defined(Status) || defined(True) || defined(False) |
@@ -23,19 +23,4 @@ |
#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 |