diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-06-27 11:21:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-27 11:21:36 -0400 |
| commit | c6959449d1e28f16d6eaf3a215f2bce5fab5ed0f (patch) | |
| tree | 1ceac7222976e40bb12c3919cd3412d36b7ec93b /externals | |
| parent | 20111c86b65afef07923fdb2f15867b7f8c69e32 (diff) | |
| parent | b6c6dcc5760ebaf08460c176c42d1c4729e2eb21 (diff) | |
Merge pull request #10473 from GPUCode/vma
Use vulkan memory allocator
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| m--------- | externals/vma/VulkanMemoryAllocator | 0 | ||||
| -rw-r--r-- | externals/vma/vma.cpp | 8 |
3 files changed, 13 insertions, 0 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7cce27d51..0184289eb 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -143,6 +143,11 @@ endif() # TZDB (Time Zone Database) add_subdirectory(nx_tzdb) +# VMA +add_library(vma vma/vma.cpp) +target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include) +target_link_libraries(vma PRIVATE Vulkan::Headers) + if (NOT TARGET LLVM::Demangle) add_library(demangle demangle/ItaniumDemangle.cpp) target_include_directories(demangle PUBLIC ./demangle) diff --git a/externals/vma/VulkanMemoryAllocator b/externals/vma/VulkanMemoryAllocator new file mode 160000 +Subproject 0aa3989b8f382f185fdf646cc83a1d16fa31d6a diff --git a/externals/vma/vma.cpp b/externals/vma/vma.cpp new file mode 100644 index 000000000..1fe2cf52b --- /dev/null +++ b/externals/vma/vma.cpp @@ -0,0 +1,8 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#define VMA_IMPLEMENTATION +#define VMA_STATIC_VULKAN_FUNCTIONS 0 +#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 + +#include <vk_mem_alloc.h>
\ No newline at end of file |