summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt6
-rw-r--r--externals/CMakeLists.txt5
m---------externals/Vulkan-Utility-Libraries0
-rw-r--r--src/video_core/CMakeLists.txt2
5 files changed, 15 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index e65997afc..52256d86f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
64[submodule "oaknut"] 64[submodule "oaknut"]
65 path = externals/oaknut 65 path = externals/oaknut
66 url = https://github.com/merryhime/oaknut 66 url = https://github.com/merryhime/oaknut
67[submodule "Vulkan-Utility-Libraries"]
68 path = externals/Vulkan-Utility-Libraries
69 url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cd6b2108..eb26fbfd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,8 @@ option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}")
36 36
37option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON) 37option(YUZU_USE_EXTERNAL_VULKAN_HEADERS "Use Vulkan-Headers from externals" ON)
38 38
39option(YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES "Use Vulkan-Utility-Libraries from externals" ON)
40
39option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF) 41option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
40 42
41option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) 43option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
@@ -308,6 +310,10 @@ if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS)
308 find_package(Vulkan 1.3.274 REQUIRED) 310 find_package(Vulkan 1.3.274 REQUIRED)
309endif() 311endif()
310 312
313if (NOT YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
314 find_package(VulkanUtilityLibraries REQUIRED)
315endif()
316
311if (ENABLE_LIBUSB) 317if (ENABLE_LIBUSB)
312 find_package(libusb 1.0.24 MODULE) 318 find_package(libusb 1.0.24 MODULE)
313endif() 319endif()
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 407c5c640..c84bedb2d 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -154,6 +154,11 @@ if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
154 add_subdirectory(Vulkan-Headers) 154 add_subdirectory(Vulkan-Headers)
155endif() 155endif()
156 156
157# Vulkan-Utility-Libraries
158if (YUZU_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES)
159 add_subdirectory(Vulkan-Utility-Libraries)
160endif()
161
157# TZDB (Time Zone Database) 162# TZDB (Time Zone Database)
158add_subdirectory(nx_tzdb) 163add_subdirectory(nx_tzdb)
159 164
diff --git a/externals/Vulkan-Utility-Libraries b/externals/Vulkan-Utility-Libraries
new file mode 160000
Subproject 524f8910d0e4a5f2ec5961996b23e5b74b95cb1
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index c22c7631c..3d7a59f87 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -303,7 +303,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
303 303
304add_dependencies(video_core host_shaders) 304add_dependencies(video_core host_shaders)
305target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) 305target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
306target_link_libraries(video_core PRIVATE sirit Vulkan::Headers GPUOpen::VulkanMemoryAllocator) 306target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)
307 307
308if (ENABLE_NSIGHT_AFTERMATH) 308if (ENABLE_NSIGHT_AFTERMATH)
309 if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK}) 309 if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})