summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--externals/CMakeLists.txt2
m---------externals/vma/VulkanMemoryAllocator (renamed from externals/vma/vma)0
-rw-r--r--externals/vma/vma.cpp1
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp2
-rw-r--r--src/video_core/vulkan_common/vulkan_memory_allocator.cpp2
-rw-r--r--src/video_core/vulkan_common/vulkan_wrapper.cpp2
7 files changed, 4 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index cc0e97a85..5a8169b44 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,6 +55,6 @@
55[submodule "tzdb_to_nx"] 55[submodule "tzdb_to_nx"]
56 path = externals/nx_tzdb/tzdb_to_nx 56 path = externals/nx_tzdb/tzdb_to_nx
57 url = https://github.com/lat9nq/tzdb_to_nx.git 57 url = https://github.com/lat9nq/tzdb_to_nx.git
58[submodule "externals/vma/vma"] 58[submodule "VulkanMemoryAllocator"]
59 path = externals/vma/vma 59 path = externals/vma/VulkanMemoryAllocator
60 url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator 60 url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index ca4ebe4b9..0184289eb 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -145,7 +145,7 @@ add_subdirectory(nx_tzdb)
145 145
146# VMA 146# VMA
147add_library(vma vma/vma.cpp) 147add_library(vma vma/vma.cpp)
148target_include_directories(vma PUBLIC ./vma/vma/include) 148target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include)
149target_link_libraries(vma PRIVATE Vulkan::Headers) 149target_link_libraries(vma PRIVATE Vulkan::Headers)
150 150
151if (NOT TARGET LLVM::Demangle) 151if (NOT TARGET LLVM::Demangle)
diff --git a/externals/vma/vma b/externals/vma/VulkanMemoryAllocator
Subproject 0aa3989b8f382f185fdf646cc83a1d16fa31d6a Subproject 0aa3989b8f382f185fdf646cc83a1d16fa31d6a
diff --git a/externals/vma/vma.cpp b/externals/vma/vma.cpp
index ff1acc320..1fe2cf52b 100644
--- a/externals/vma/vma.cpp
+++ b/externals/vma/vma.cpp
@@ -4,4 +4,5 @@
4#define VMA_IMPLEMENTATION 4#define VMA_IMPLEMENTATION
5#define VMA_STATIC_VULKAN_FUNCTIONS 0 5#define VMA_STATIC_VULKAN_FUNCTIONS 0
6#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 6#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
7
7#include <vk_mem_alloc.h> \ No newline at end of file 8#include <vk_mem_alloc.h> \ No newline at end of file
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index 94dd1aa14..31226084f 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -22,8 +22,6 @@
22#include <adrenotools/bcenabler.h> 22#include <adrenotools/bcenabler.h>
23#endif 23#endif
24 24
25#define VMA_STATIC_VULKAN_FUNCTIONS 0
26#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
27#include <vk_mem_alloc.h> 25#include <vk_mem_alloc.h>
28 26
29namespace Vulkan { 27namespace Vulkan {
diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp
index 70db41343..a2ef0efa4 100644
--- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp
+++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp
@@ -15,8 +15,6 @@
15#include "video_core/vulkan_common/vulkan_memory_allocator.h" 15#include "video_core/vulkan_common/vulkan_memory_allocator.h"
16#include "video_core/vulkan_common/vulkan_wrapper.h" 16#include "video_core/vulkan_common/vulkan_wrapper.h"
17 17
18#define VMA_STATIC_VULKAN_FUNCTIONS 0
19#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
20#include <vk_mem_alloc.h> 18#include <vk_mem_alloc.h>
21 19
22namespace Vulkan { 20namespace Vulkan {
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp
index c01a9478e..28fcb21a0 100644
--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp
+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp
@@ -12,8 +12,6 @@
12 12
13#include "video_core/vulkan_common/vulkan_wrapper.h" 13#include "video_core/vulkan_common/vulkan_wrapper.h"
14 14
15#define VMA_STATIC_VULKAN_FUNCTIONS 0
16#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
17#include <vk_mem_alloc.h> 15#include <vk_mem_alloc.h>
18 16
19namespace Vulkan::vk { 17namespace Vulkan::vk {