diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-11 10:09:18 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 10:09:18 -0700 |
| commit | 18a2f9dff839a3f60850c25e1a701b682a497afb (patch) | |
| tree | 0113e4f746b09221f6ccce88beadb60432347682 /include | |
| parent | 393c2ff0d2db9c5d84e6ed660ea9f546f438cb47 (diff) | |
Add base class for GLTestContext and add new subclass VkTestContext.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1964243003
Review-Url: https://codereview.chromium.org/1964243003
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index 7ff81c84f9..7f4b59dccf 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 |