diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-07-17 16:42:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 16:42:41 +0200 |
| commit | 5593bed08ad913ebc3b9ad17799391fb5289c2c3 (patch) | |
| tree | 43fa15d682207552d9f2aa29d080e1da13b3dd2c /src | |
| parent | Merge pull request #11102 from v1993/your-mom-is-encrypted (diff) | |
| parent | cmake: allow using system VMA library (diff) | |
| download | yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.gz yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.bz2 yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.lz yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.xz yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.tar.zst yuzu-5593bed08ad913ebc3b9ad17799391fb5289c2c3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/vma.cpp (renamed from externals/vma/vma.cpp) | 0 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 3b2fe01da..7f79111e0 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -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) diff --git a/externals/vma/vma.cpp b/src/video_core/vulkan_common/vma.cpp index 1fe2cf52b..1fe2cf52b 100644 --- a/externals/vma/vma.cpp +++ b/src/video_core/vulkan_common/vma.cpp |