diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-04-25 13:38:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-25 18:30:37 +0000 |
| commit | ec6ae52168ae4803c2312c362280f7f79e0d380e (patch) | |
| tree | 7404350bcf03ba924580f3c7733b7c53dba3bccc /include | |
| parent | c15bb7b10736e7b8f8d4bd0207c608546206ec1b (diff) | |
Use system Vulkan headers except when no building with vulkan support
We now will always use the system vulkan.h files whenever we are building
with vulkan. With non vulkan builds we use our checked in header to so
that we can get the needed symbols for compiling.
Bug: skia:
Change-Id: I352a3e007b33c575cefcfd6752db0b3b12b86a16
Reviewed-on: https://skia-review.googlesource.com/14270
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index a12cadae25..7b9ee8dadf 100644 --- a/include/gpu/vk/GrVkDefines.h +++ b/include/gpu/vk/GrVkDefines.h @@ -33,6 +33,11 @@ # pragma error "Macros unexpectedly defined." #endif -#include <vulkan.h> +#include <vulkan/vulkan.h> + +#define SKIA_REQUIRED_VULKAN_HEADER_VERSION 17 +#if VK_HEADER_VERSION < SKIA_REQUIRED_VULKAN_HEADER_VERSION +#error "Vulkan header version is too low" +#endif #endif |