diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-12-07 13:19:40 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-07 13:19:51 +0000 |
| commit | b351817588baf94ac725e35f10ee1d5ff8178834 (patch) | |
| tree | e93ee75bbc850fa9dd567825b9bbc7c01456f891 /include | |
| parent | 4f498fc6f07ffd57b747e5cd2f99a03c6281aa22 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index be269e6b46..058ac236d0 100644 --- a/include/gpu/vk/GrVkDefines.h +++ b/include/gpu/vk/GrVkDefines.h @@ -11,40 +11,33 @@ #ifdef SK_VULKAN -#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 +#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 # endif -# elif defined(SK_BUILD_FOR_ANDROID) -# if !defined(VK_USE_PLATFORM_ANDROID_KHR) -# define VK_USE_PLATFORM_ANDROID_KHR +# else +# if !defined(VK_USE_PLATFORM_XCB_KHR) +# define VK_USE_PLATFORM_XCB_KHR # 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 +# 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> -#endif // SK_VULKAN_HEADER +#include <vulkan/vulkan.h> #define SKIA_REQUIRED_VULKAN_HEADER_VERSION 17 #if VK_HEADER_VERSION < SKIA_REQUIRED_VULKAN_HEADER_VERSION |