diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-22 13:25:15 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-22 19:08:05 +0000 |
| commit | 91dfa3b571f1048d70033385de2c0c8b4a07373f (patch) | |
| tree | 97918b0b6384280c46d1bda6cd473bfd805ce3a0 /tools/gpu | |
| parent | b918e9865ac5e1ce86b1a04f8e8b2eb1cbd4d14f (diff) | |
Reland "Move gn setup for vulkan library/headers into their own third_party directory."
This reverts commit 2c2a119f945eedaced4bf081347a53f05cf0c39c.
Reason for revert: Relanding with fixes
Original change's description:
> Revert "Move gn setup for vulkan library/headers into their own third_party directory."
>
> This reverts commit 477094250cd55a38d4d796ab6c50eb57bdba65e1.
>
> Reason for revert:
> I think we know this broke the MoltenVK bots. It also appears to have broken the Fuchsia roll: https://logs.chromium.org/v/?s=fuchsia%2Fbuildbucket%2Fcr-buildbucket.appspot.com%2F8945885190914943680%2F%2B%2Fsteps%2Fbuild%2F0%2Fsteps%2Fbuild_fuchsia%2F0%2Fsteps%2Fgn_gen%2F0%2Fstdout
>
> Original change's description:
> > Move gn setup for vulkan library/headers into their own third_party directory.
> >
> > Bug: skia:
> > Change-Id: I4605f0d962271efb77bf3c17f1b0daaaddfb51c8
> > Reviewed-on: https://skia-review.googlesource.com/128540
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Mike Klein <mtklein@google.com>
> > Reviewed-by: Ben Wagner <bungeman@google.com>
>
> TBR=egdaniel@google.com,mtklein@google.com,bungeman@google.com
>
> Change-Id: I6e41d98e39883eff34424a2f352b0c8adec178db
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/129444
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
Bug: skia:
Change-Id: I26b4b1f7196dd1bd8bf2e7641ef741c90c742c81
Reviewed-on: https://skia-review.googlesource.com/129445
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tools/gpu')
| -rw-r--r-- | tools/gpu/vk/GrVulkanDefines.h | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/tools/gpu/vk/GrVulkanDefines.h b/tools/gpu/vk/GrVulkanDefines.h index 2052341dbb..78d09545be 100644 --- a/tools/gpu/vk/GrVulkanDefines.h +++ b/tools/gpu/vk/GrVulkanDefines.h @@ -10,26 +10,29 @@ #include "SkTypes.h" -#if defined(SK_BUILD_FOR_WIN) -# 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(VK_USE_PLATFORM_XCB_KHR) -# define VK_USE_PLATFORM_XCB_KHR -# 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) -#define VK_NO_PROTOTYPES -#endif + #ifdef SK_MOLTENVK + #include <MoltenVk/mvk_vulkan.h> + #else + #if defined(SK_BUILD_FOR_WIN) + # 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(VK_USE_PLATFORM_XCB_KHR) + # define VK_USE_PLATFORM_XCB_KHR + # endif + #endif -#include <vulkan/vulkan.h> // IWYU pragma: export + // 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) + #define VK_NO_PROTOTYPES + #endif + #include <vulkan/vulkan.h> // IWYU pragma: export + #endif #endif |