diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-06-14 16:27:40 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-15 13:17:14 +0000 |
| commit | 0e4a12b5259ccb456aaeb14286b793f3a96c842f (patch) | |
| tree | 523612f4b1edca368f16511f53dfd68b795874ba /third_party | |
| 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>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/vulkanmemoryallocator/include/vk_mem_alloc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h b/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h index b621fe7e14..74af2c9ae8 100644 --- a/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h +++ b/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h @@ -1071,7 +1071,10 @@ Features deliberately excluded from the scope of this library: */
-#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.
|