Browse Source
Merge pull request #10934 from abouvier/cmake-vma
cmake: allow using system VMA library
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
11 additions and
6 deletions
-
.gitmodules
-
CMakeLists.txt
-
externals/CMakeLists.txt
-
externals/VulkanMemoryAllocator
-
externals/vma/VulkanMemoryAllocator
-
src/video_core/CMakeLists.txt
-
src/video_core/vulkan_common/vma.cpp
|
|
|
@ -56,5 +56,5 @@ |
|
|
|
path = externals/nx_tzdb/tzdb_to_nx |
|
|
|
url = https://github.com/lat9nq/tzdb_to_nx.git |
|
|
|
[submodule "VulkanMemoryAllocator"] |
|
|
|
path = externals/vma/VulkanMemoryAllocator |
|
|
|
path = externals/VulkanMemoryAllocator |
|
|
|
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git |
|
|
|
@ -293,6 +293,7 @@ find_package(LLVM MODULE COMPONENTS Demangle) |
|
|
|
find_package(lz4 REQUIRED) |
|
|
|
find_package(nlohmann_json 3.8 REQUIRED) |
|
|
|
find_package(Opus 1.3 MODULE) |
|
|
|
find_package(VulkanMemoryAllocator CONFIG) |
|
|
|
find_package(ZLIB 1.2 REQUIRED) |
|
|
|
find_package(zstd 1.5 REQUIRED) |
|
|
|
|
|
|
|
|
|
|
|
@ -144,9 +144,9 @@ endif() |
|
|
|
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 GPUOpen::VulkanMemoryAllocator) |
|
|
|
add_subdirectory(VulkanMemoryAllocator) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (NOT TARGET LLVM::Demangle) |
|
|
|
add_library(demangle demangle/ItaniumDemangle.cpp) |
|
|
|
|
|
|
|
@ -0,0 +1 @@ |
|
|
|
Subproject commit 9b0fc3e7b02afe97895eb3e945fe800c3a7485ac |
|
|
|
@ -1 +0,0 @@ |
|
|
|
Subproject commit 0aa3989b8f382f185fdf646cc83a1d16fa31d6ab |
|
|
|
@ -274,6 +274,7 @@ add_library(video_core STATIC |
|
|
|
vulkan_common/vulkan_wrapper.h |
|
|
|
vulkan_common/nsight_aftermath_tracker.cpp |
|
|
|
vulkan_common/nsight_aftermath_tracker.h |
|
|
|
vulkan_common/vma.cpp |
|
|
|
) |
|
|
|
|
|
|
|
create_target_directory_groups(video_core) |
|
|
|
@ -291,7 +292,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS}) |
|
|
|
|
|
|
|
add_dependencies(video_core host_shaders) |
|
|
|
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) |
|
|
|
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers vma) |
|
|
|
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers GPUOpen::VulkanMemoryAllocator) |
|
|
|
|
|
|
|
if (ENABLE_NSIGHT_AFTERMATH) |
|
|
|
if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK}) |
|
|
|
@ -324,6 +325,9 @@ else() |
|
|
|
|
|
|
|
# xbyak |
|
|
|
set_source_files_properties(macro/macro_jit_x64.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-shadow") |
|
|
|
|
|
|
|
# VMA |
|
|
|
set_source_files_properties(vulkan_common/vma.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-unused-variable;-Wno-unused-parameter;-Wno-missing-field-initializers") |
|
|
|
endif() |
|
|
|
|
|
|
|
if (ARCHITECTURE_x86_64) |
|
|
|
|
