summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGPUCode <geoster3d@gmail.com>2023-06-25 14:08:38 +0200
committerGPUCode <geoster3d@gmail.com>2023-06-26 17:59:24 +0200
commitb6c6dcc5760ebaf08460c176c42d1c4729e2eb21 (patch)
tree41426f4d3437e28901e7764c0025eac2c6538539
parentvulkan_common: Remove required flags (diff)
downloadyuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.tar
yuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.tar.gz
yuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.tar.bz2
yuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.tar.lz
yuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.tar.xz
yuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.tar.zst
yuzu-b6c6dcc5760ebaf08460c176c42d1c4729e2eb21.zip
Diffstat (limited to '')
-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 @@
[submodule "tzdb_to_nx"]
path = externals/nx_tzdb/tzdb_to_nx
url = https://github.com/lat9nq/tzdb_to_nx.git
-[submodule "externals/vma/vma"]
- path = externals/vma/vma
+[submodule "VulkanMemoryAllocator"]
+ path = externals/vma/VulkanMemoryAllocator
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)
# VMA
add_library(vma vma/vma.cpp)
-target_include_directories(vma PUBLIC ./vma/vma/include)
+target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include)
target_link_libraries(vma PRIVATE Vulkan::Headers)
if (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 @@
#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
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 @@
#include <adrenotools/bcenabler.h>
#endif
-#define VMA_STATIC_VULKAN_FUNCTIONS 0
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h>
namespace 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 @@
#include "video_core/vulkan_common/vulkan_memory_allocator.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"
-#define VMA_STATIC_VULKAN_FUNCTIONS 0
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h>
namespace 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 @@
#include "video_core/vulkan_common/vulkan_wrapper.h"
-#define VMA_STATIC_VULKAN_FUNCTIONS 0
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
#include <vk_mem_alloc.h>
namespace Vulkan::vk {