diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/vma.cpp | 8 |
2 files changed, 13 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 | |||
| 274 | vulkan_common/vulkan_wrapper.h | 274 | vulkan_common/vulkan_wrapper.h |
| 275 | vulkan_common/nsight_aftermath_tracker.cpp | 275 | vulkan_common/nsight_aftermath_tracker.cpp |
| 276 | vulkan_common/nsight_aftermath_tracker.h | 276 | vulkan_common/nsight_aftermath_tracker.h |
| 277 | vulkan_common/vma.cpp | ||
| 277 | ) | 278 | ) |
| 278 | 279 | ||
| 279 | create_target_directory_groups(video_core) | 280 | create_target_directory_groups(video_core) |
| @@ -291,7 +292,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS}) | |||
| 291 | 292 | ||
| 292 | add_dependencies(video_core host_shaders) | 293 | add_dependencies(video_core host_shaders) |
| 293 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) | 294 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) |
| 294 | target_link_libraries(video_core PRIVATE sirit Vulkan::Headers vma) | 295 | target_link_libraries(video_core PRIVATE sirit Vulkan::Headers GPUOpen::VulkanMemoryAllocator) |
| 295 | 296 | ||
| 296 | if (ENABLE_NSIGHT_AFTERMATH) | 297 | if (ENABLE_NSIGHT_AFTERMATH) |
| 297 | if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK}) | 298 | if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK}) |
| @@ -324,6 +325,9 @@ else() | |||
| 324 | 325 | ||
| 325 | # xbyak | 326 | # xbyak |
| 326 | set_source_files_properties(macro/macro_jit_x64.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-shadow") | 327 | set_source_files_properties(macro/macro_jit_x64.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-shadow") |
| 328 | |||
| 329 | # VMA | ||
| 330 | set_source_files_properties(vulkan_common/vma.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-unused-variable;-Wno-unused-parameter;-Wno-missing-field-initializers") | ||
| 327 | endif() | 331 | endif() |
| 328 | 332 | ||
| 329 | if (ARCHITECTURE_x86_64) | 333 | if (ARCHITECTURE_x86_64) |
diff --git a/src/video_core/vulkan_common/vma.cpp b/src/video_core/vulkan_common/vma.cpp new file mode 100644 index 000000000..1fe2cf52b --- /dev/null +++ b/src/video_core/vulkan_common/vma.cpp | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project | ||
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | #define VMA_IMPLEMENTATION | ||
| 5 | #define VMA_STATIC_VULKAN_FUNCTIONS 0 | ||
| 6 | #define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 | ||
| 7 | |||
| 8 | #include <vk_mem_alloc.h> \ No newline at end of file | ||