| commit | 0e4a12b5259ccb456aaeb14286b793f3a96c842f | [log] [tgz] |
|---|---|---|
| author | Greg Daniel <egdaniel@google.com> | Thu Jun 14 16:27:40 2018 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Jun 15 13:17:14 2018 +0000 |
| tree | 523612f4b1edca368f16511f53dfd68b795874ba | |
| parent | d7bfcaf57c1fe1d84880e0d31fab9c3d303cdb79 [diff] |
Don't explicitly include vulkan.h in the vulkan memory allocator. Bug: skia: Change-Id: I57dc374822fd22e25ef22d03345bdd2e159c7edd Reviewed-on: https://skia-review.googlesource.com/135048 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index 0fd405d..ac8b444 100644 --- a/include/gpu/vk/GrVkDefines.h +++ b/include/gpu/vk/GrVkDefines.h
@@ -9,6 +9,8 @@ #ifndef GrVkDefines_DEFINED #define GrVkDefines_DEFINED +#include "SkTypes.h" + #ifdef SK_VULKAN #ifdef SK_VULKAN_HEADER
diff --git a/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h b/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h index b621fe7..74af2c9 100644 --- a/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h +++ b/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
@@ -1071,7 +1071,10 @@ */ -#include <vulkan/vulkan.h> +// For skia we don't include vulkan.h here. Before including this header we always include +// GrVkDefines which has a user defined header. Additionally we don't require vulkan/vulkan.h to be +// on the include path. +// #include <vulkan/vulkan.h> /** \struct VmaAllocator \brief Represents main object of this library initialized.