diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-12-07 12:48:30 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-07 18:29:39 +0000 |
| commit | afb7ec7a4018744e83db66948e5a09c6a6f065af (patch) | |
| tree | 95b497c6e18640c82f54a31d1ba7a222e74d6c04 /include/gpu/vk | |
| parent | 44aa9b2d1e708acb0e32db549abff793283ff442 (diff) | |
Revert "Revert "Add define to use customize vulkan header.""
This reverts commit b351817588baf94ac725e35f10ee1d5ff8178834.
Reason for revert: Relanding with android fixes
Original change's description:
> Revert "Add define to use customize vulkan header."
>
> This reverts commit a492eb0e1f08311bfa47f46c660144e7bc8a6c0e.
>
> Reason for revert: Breaking Android roll (b/c builds tools?)
>
> Original change's description:
> > Add define to use customize vulkan header.
> >
> > Bug: skia:
> > Change-Id: Ia87c81a54603a02b2f8f51a735bf173a49afe6c7
> > Reviewed-on: https://skia-review.googlesource.com/81121
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com
>
> Change-Id: I80a685bf88af909865f274ffc61686be57e8c313
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/81740
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: Ia701e884bfa3799dc73002f892feb2ecafe9da12
Reviewed-on: https://skia-review.googlesource.com/81742
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include/gpu/vk')
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index 058ac236d0..be269e6b46 100644 --- a/include/gpu/vk/GrVkDefines.h +++ b/include/gpu/vk/GrVkDefines.h @@ -11,33 +11,40 @@ #ifdef SK_VULKAN -#if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_WIN32) -# if !defined(VK_USE_PLATFORM_WIN32_KHR) -# define VK_USE_PLATFORM_WIN32_KHR -# endif -#elif defined(SK_BUILD_FOR_ANDROID) -# if !defined(VK_USE_PLATFORM_ANDROID_KHR) -# define VK_USE_PLATFORM_ANDROID_KHR -# endif -#elif defined(SK_BUILD_FOR_UNIX) -# if defined(__Fuchsia__) -# if !defined(VK_USE_PLATFORM_MAGMA_KHR) -# define VK_USE_PLATFORM_MAGMA_KHR +#ifdef SK_VULKAN_HEADER +#include SK_VULKAN_HEADER +#else +// This is deprecated and all clients should define their own custum header shim that sets up +// defines and includes the vulkan.h header. Then they should define SK_VULKAN_HEADER or set the +// skia_vulkan_header in gn to point to their custom header. +# if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_WIN32) +# if !defined(VK_USE_PLATFORM_WIN32_KHR) +# define VK_USE_PLATFORM_WIN32_KHR # endif -# else -# if !defined(VK_USE_PLATFORM_XCB_KHR) -# define VK_USE_PLATFORM_XCB_KHR +# elif defined(SK_BUILD_FOR_ANDROID) +# if !defined(VK_USE_PLATFORM_ANDROID_KHR) +# define VK_USE_PLATFORM_ANDROID_KHR # endif -# endif -#endif +# elif defined(SK_BUILD_FOR_UNIX) +# if defined(__Fuchsia__) +# if !defined(VK_USE_PLATFORM_MAGMA_KHR) +# define VK_USE_PLATFORM_MAGMA_KHR +# endif +# else +# if !defined(VK_USE_PLATFORM_XCB_KHR) +# define VK_USE_PLATFORM_XCB_KHR +# endif +# endif +# endif // We create our own function table and never directly call any functions via vk*(). So no need to // include the prototype functions. -#if !defined(VK_NO_PROTOTYPES) && !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) -#define VK_NO_PROTOTYPES -#endif +# if !defined(VK_NO_PROTOTYPES) && !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) +# define VK_NO_PROTOTYPES +# endif -#include <vulkan/vulkan.h> +# include <vulkan/vulkan.h> +#endif // SK_VULKAN_HEADER #define SKIA_REQUIRED_VULKAN_HEADER_VERSION 17 #if VK_HEADER_VERSION < SKIA_REQUIRED_VULKAN_HEADER_VERSION |