From 6448eade2ef126a88068cde66b77e7788c3fab08 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sun, 18 Jun 2023 04:59:12 -0400 Subject: externals: Add vma and initialize it video_core: Move vma implementation to library --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 89f2ad924..cc0e97a85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +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 + url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator -- cgit v1.2.3 From b6c6dcc5760ebaf08460c176c42d1c4729e2eb21 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sun, 25 Jun 2023 15:08:38 +0300 Subject: externals: Use cmake subdirectory --- .gitmodules | 4 ++-- externals/CMakeLists.txt | 2 +- externals/vma/VulkanMemoryAllocator | 1 + externals/vma/vma | 1 - externals/vma/vma.cpp | 1 + src/video_core/vulkan_common/vulkan_device.cpp | 2 -- src/video_core/vulkan_common/vulkan_memory_allocator.cpp | 2 -- src/video_core/vulkan_common/vulkan_wrapper.cpp | 2 -- 8 files changed, 5 insertions(+), 10 deletions(-) create mode 160000 externals/vma/VulkanMemoryAllocator delete mode 160000 externals/vma/vma (limited to '.gitmodules') 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/VulkanMemoryAllocator b/externals/vma/VulkanMemoryAllocator new file mode 160000 index 000000000..0aa3989b8 --- /dev/null +++ b/externals/vma/VulkanMemoryAllocator @@ -0,0 +1 @@ +Subproject commit 0aa3989b8f382f185fdf646cc83a1d16fa31d6ab diff --git a/externals/vma/vma b/externals/vma/vma deleted file mode 160000 index 0aa3989b8..000000000 --- a/externals/vma/vma +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0aa3989b8f382f185fdf646cc83a1d16fa31d6ab 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 \ 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 #endif -#define VMA_STATIC_VULKAN_FUNCTIONS 0 -#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 #include 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 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 namespace Vulkan::vk { -- cgit v1.2.3 From 33cd3a0db0a6199bdc98f5f2d60a042cf8afa20c Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Tue, 27 Jun 2023 23:39:29 +0200 Subject: gitmodules: normalize indentation and url --- .gitmodules | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 5a8169b44..9f96b70be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,35 +2,35 @@ # SPDX-License-Identifier: GPL-2.0-or-later [submodule "enet"] - path = externals/enet - url = https://github.com/lsalzman/enet.git + path = externals/enet + url = https://github.com/lsalzman/enet.git [submodule "inih"] - path = externals/inih/inih - url = https://github.com/benhoyt/inih.git + path = externals/inih/inih + url = https://github.com/benhoyt/inih.git [submodule "cubeb"] - path = externals/cubeb - url = https://github.com/mozilla/cubeb.git + path = externals/cubeb + url = https://github.com/mozilla/cubeb.git [submodule "dynarmic"] - path = externals/dynarmic - url = https://github.com/MerryMage/dynarmic.git + path = externals/dynarmic + url = https://github.com/merryhime/dynarmic.git [submodule "libusb"] path = externals/libusb/libusb url = https://github.com/libusb/libusb.git [submodule "discord-rpc"] - path = externals/discord-rpc - url = https://github.com/yuzu-emu/discord-rpc.git + path = externals/discord-rpc + url = https://github.com/yuzu-emu/discord-rpc.git [submodule "Vulkan-Headers"] - path = externals/Vulkan-Headers - url = https://github.com/KhronosGroup/Vulkan-Headers.git + path = externals/Vulkan-Headers + url = https://github.com/KhronosGroup/Vulkan-Headers.git [submodule "sirit"] - path = externals/sirit - url = https://github.com/yuzu-emu/sirit + path = externals/sirit + url = https://github.com/yuzu-emu/sirit.git [submodule "mbedtls"] - path = externals/mbedtls - url = https://github.com/yuzu-emu/mbedtls + path = externals/mbedtls + url = https://github.com/yuzu-emu/mbedtls.git [submodule "xbyak"] - path = externals/xbyak - url = https://github.com/herumi/xbyak.git + path = externals/xbyak + url = https://github.com/herumi/xbyak.git [submodule "opus"] path = externals/opus/opus url = https://github.com/xiph/opus.git @@ -45,16 +45,16 @@ url = https://github.com/FFmpeg/FFmpeg.git [submodule "vcpkg"] path = externals/vcpkg - url = https://github.com/Microsoft/vcpkg.git + url = https://github.com/microsoft/vcpkg.git [submodule "cpp-jwt"] path = externals/cpp-jwt url = https://github.com/arun11299/cpp-jwt.git [submodule "libadrenotools"] path = externals/libadrenotools - url = https://github.com/bylaws/libadrenotools + url = https://github.com/bylaws/libadrenotools.git [submodule "tzdb_to_nx"] path = externals/nx_tzdb/tzdb_to_nx url = https://github.com/lat9nq/tzdb_to_nx.git [submodule "VulkanMemoryAllocator"] path = externals/vma/VulkanMemoryAllocator - url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator + url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git -- cgit v1.2.3