diff options
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 2 | ||||
| -rw-r--r-- | third_party/vulkanmemoryallocator/include/vk_mem_alloc.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index 0fd405d55c..ac8b444032 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 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.
|