externals: Use cmake subdirectory

.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

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)

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>

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 {

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 {

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 {