From 1053eb487ce8254891c5180f3d1d510bb005f44f Mon Sep 17 00:00:00 2001 From: kearwood Date: Fri, 14 Jan 2022 18:37:14 -0800 Subject: [PATCH] Imported Vulkan Memory Allocator submodule --- .gitmodules | 3 +++ 3rdparty/vma | 1 + CMakeLists.txt | 3 +++ kraken/KREngine-common.h | 1 + 4 files changed, 8 insertions(+) create mode 160000 3rdparty/vma diff --git a/.gitmodules b/.gitmodules index 83cc629..a3957cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "3rdparty/volk"] path = 3rdparty/volk url = https://github.com/zeux/volk +[submodule "3rdparty/vma"] + path = 3rdparty/vma + url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git diff --git a/3rdparty/vma b/3rdparty/vma new file mode 160000 index 0000000..eccbce2 --- /dev/null +++ b/3rdparty/vma @@ -0,0 +1 @@ +Subproject commit eccbce26d8a0130f5544b7154f81697754cda61e diff --git a/CMakeLists.txt b/CMakeLists.txt index e43d94b..836a1a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,9 @@ endif() list (APPEND EXTRA_LIBS vulkan) +# ---- Vulkan Memory Allocator ---- +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/vma/include") + # ---- Volk ---- # volk set(VOLK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/volk") diff --git a/kraken/KREngine-common.h b/kraken/KREngine-common.h index 90eb958..98ef571 100755 --- a/kraken/KREngine-common.h +++ b/kraken/KREngine-common.h @@ -124,6 +124,7 @@ using std::unordered_multimap; using std::hash; #include +#include #include #if defined(ANDROID) #include