Imported Vulkan Memory Allocator submodule

This commit is contained in:
2022-01-14 18:37:14 -08:00
parent 3a06069184
commit 1053eb487c
4 changed files with 8 additions and 0 deletions

3
.gitmodules vendored
View File

@@ -16,3 +16,6 @@
[submodule "3rdparty/volk"] [submodule "3rdparty/volk"]
path = 3rdparty/volk path = 3rdparty/volk
url = https://github.com/zeux/volk url = https://github.com/zeux/volk
[submodule "3rdparty/vma"]
path = 3rdparty/vma
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git

1
3rdparty/vma vendored Submodule

Submodule 3rdparty/vma added at eccbce26d8

View File

@@ -130,6 +130,9 @@ endif()
list (APPEND EXTRA_LIBS vulkan) list (APPEND EXTRA_LIBS vulkan)
# ---- Vulkan Memory Allocator ----
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/vma/include")
# ---- Volk ---- # ---- Volk ----
# volk # volk
set(VOLK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/volk") set(VOLK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/volk")

View File

@@ -124,6 +124,7 @@ using std::unordered_multimap;
using std::hash; using std::hash;
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include <vk_mem_alloc.h>
#include <volk.h> #include <volk.h>
#if defined(ANDROID) #if defined(ANDROID)
#include <GLES3/gl3.h> #include <GLES3/gl3.h>