AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't explicitly include vulkan.h in the vulkan memory allocator.

Browse Source 
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>
This commit is contained in:
Greg Daniel 2018-06-14 16:27:40 -04:00 committed by Skia Commit-Bot
parent d7bfcaf57c
commit 0e4a12b525
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gpu/vk/GrVkDefines.h
View File

@ -9,6 +9,8 @@
#ifndef GrVkDefines_DEFINED #ifndef GrVkDefines_DEFINED
#define GrVkDefines_DEFINED #define GrVkDefines_DEFINED
#include "SkTypes.h"
#ifdef SK_VULKAN #ifdef SK_VULKAN
#ifdef SK_VULKAN_HEADER #ifdef SK_VULKAN_HEADER

5
third_party/vulkanmemoryallocator/include/vk_mem_alloc.h vendored
View File

@ -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 /** \struct VmaAllocator
\brief Represents main object of this library initialized. \brief Represents main object of this library initialized.