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 /platform_tools | |
| 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 'platform_tools')
| -rw-r--r-- | platform_tools/android/vulkan/Skia_Vulkan_Android.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/platform_tools/android/vulkan/Skia_Vulkan_Android.h b/platform_tools/android/vulkan/Skia_Vulkan_Android.h new file mode 100644 index 0000000000..b0749810f0 --- /dev/null +++ b/platform_tools/android/vulkan/Skia_Vulkan_Android.h @@ -0,0 +1,23 @@ +/* + * Copyright 2017 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef Skia_Vulkan_Android_DEFINED +#define Skia_Vulkan_Android_DEFINED + +#if !defined(SK_BUILD_FOR_ANDROID) +#error "Must be building for android to use this header" +#endif +#if !defined(VK_USE_PLATFORM_ANDROID_KHR) +# define VK_USE_PLATFORM_ANDROID_KHR +#endif + +#include <vulkan/vulkan.h> + +#endif + + + |