kernel/k_shared_memory: Ensure device_memory is always initialized

CMakeLists.txt

@@ -43,6 +43,8 @@ option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 
+option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)
+
 option(YUZU_TESTS "Compile tests" ON)
 
 option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
@@ -199,39 +201,24 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # System imported libraries
 # =======================================================================
 
-find_package(enet 1.3)
-find_package(fmt 9 REQUIRED)
-find_package(inih)
-find_package(lz4 REQUIRED)
-find_package(nlohmann_json 3.8 REQUIRED)
-find_package(Opus 1.3)
-find_package(Vulkan 1.3.213)
+find_package(fmt 8.0.1 REQUIRED CONFIG)
+find_package(nlohmann_json 3.8 REQUIRED CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
-find_package(zstd 1.5 REQUIRED)
 
-if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
-    find_package(xbyak 6)
+# Search for config-only package first (for vcpkg), then try non-config
+find_package(zstd 1.5 CONFIG)
+if (NOT zstd_FOUND)
+    find_package(zstd 1.5 REQUIRED)
 endif()
 
-if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
-    find_package(dynarmic 6.2.4)
-endif()
-
-if (ENABLE_CUBEB)
-    find_package(cubeb)
-endif()
-
-if (USE_DISCORD_PRESENCE)
-    find_package(DiscordRPC)
-endif()
-
-if (ENABLE_WEB_SERVICE)
-    find_package(cpp-jwt 1.4)
-    find_package(httplib 0.11)
+# lz4 1.8 is required, but vcpkg's lz4-config.cmake does not have version info
+find_package(lz4 CONFIG)
+if (NOT lz4_FOUND)
+    find_package(lz4 1.8 REQUIRED)
 endif()
 
 if (YUZU_TESTS)
-    find_package(Catch2 2.13.7 REQUIRED)
+    find_package(Catch2 2.13.7 REQUIRED CONFIG)
 endif()
 
 find_package(Boost 1.73.0 COMPONENTS context)

externals/CMakeLists.txt

@@ -6,16 +6,15 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules")
 include(DownloadExternals)
 
 # xbyak
-if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak)
+if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     add_subdirectory(xbyak EXCLUDE_FROM_ALL)
 endif()
 
 # Dynarmic
-if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic)
+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
     set(DYNARMIC_NO_BUNDLED_FMT ON)
     set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
-    add_subdirectory(dynarmic EXCLUDE_FROM_ALL)
-    add_library(dynarmic::dynarmic ALIAS dynarmic)
+    add_subdirectory(dynarmic)
 endif()
 
 # getopt
@@ -27,9 +26,7 @@ endif()
 add_subdirectory(glad)
 
 # inih
-if (NOT TARGET inih::INIReader)
-    add_subdirectory(inih)
-endif()
+add_subdirectory(inih)
 
 # mbedtls
 add_subdirectory(mbedtls EXCLUDE_FROM_ALL)
@@ -75,30 +72,25 @@ if (YUZU_USE_EXTERNAL_SDL2)
 endif()
 
 # ENet
-if (NOT TARGET enet::enet)
-    add_subdirectory(enet EXCLUDE_FROM_ALL)
-    target_include_directories(enet INTERFACE ./enet/include)
-    add_library(enet::enet ALIAS enet)
-endif()
+add_subdirectory(enet)
+target_include_directories(enet INTERFACE ./enet/include)
 
 # Cubeb
-if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb)
+if(ENABLE_CUBEB)
     set(BUILD_TESTS OFF CACHE BOOL "")
     add_subdirectory(cubeb EXCLUDE_FROM_ALL)
-    add_library(cubeb::cubeb ALIAS cubeb)
 endif()
 
 # DiscordRPC
-if (USE_DISCORD_PRESENCE AND NOT TARGET DiscordRPC::discord-rpc)
+if (USE_DISCORD_PRESENCE)
     add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
     target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
-    add_library(DiscordRPC::discord-rpc ALIAS discord-rpc)
 endif()
 
 # Sirit
-add_subdirectory(sirit EXCLUDE_FROM_ALL)
+add_subdirectory(sirit)
 
-if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)
+if (ENABLE_WEB_SERVICE)
     if (NOT WIN32)
         find_package(OpenSSL 1.1)
         if (OPENSSL_FOUND)
@@ -126,20 +118,18 @@ if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib)
     if (WIN32)
         target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32)
     endif()
-    add_library(httplib::httplib ALIAS httplib)
-endif()
-
-# cpp-jwt
-if (ENABLE_WEB_SERVICE AND NOT TARGET cpp-jwt::cpp-jwt)
+	
+    # cpp-jwt
     add_library(cpp-jwt INTERFACE)
     target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
     target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
-    add_library(cpp-jwt::cpp-jwt ALIAS cpp-jwt)
 endif()
 
 # Opus
-if (NOT TARGET Opus::opus)
+if (YUZU_USE_BUNDLED_OPUS)
     add_subdirectory(opus EXCLUDE_FROM_ALL)
+else()
+    find_package(Opus 1.3 REQUIRED)
 endif()
 
 # FFMpeg
@@ -150,8 +140,3 @@ if (YUZU_USE_BUNDLED_FFMPEG)
     set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE)
     set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
 endif()
-
-# Vulkan-Headers
-if (NOT TARGET Vulkan::Headers)
-    add_subdirectory(Vulkan-Headers EXCLUDE_FROM_ALL)
-endif()

externals/find-modules/FindDiscordRPC.cmake

@@ -1,27 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_path(DiscordRPC_INCLUDE_DIR discord_rpc.h)
-
-find_library(DiscordRPC_LIBRARY discord-rpc)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DiscordRPC
-    REQUIRED_VARS
-        DiscordRPC_LIBRARY
-        DiscordRPC_INCLUDE_DIR
-)
-
-if (DiscordRPC_FOUND AND NOT TARGET DiscordRPC::discord-rpc)
-    add_library(DiscordRPC::discord-rpc UNKNOWN IMPORTED)
-    set_target_properties(DiscordRPC::discord-rpc PROPERTIES
-        IMPORTED_LOCATION "${DiscordRPC_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${DiscordRPC_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(
-    DiscordRPC_INCLUDE_DIR
-    DiscordRPC_LIBRARY
-)

externals/find-modules/Findenet.cmake

@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_package(PkgConfig QUIET)
-if (PKG_CONFIG_FOUND)
-    pkg_search_module(ENET QUIET IMPORTED_TARGET GLOBAL libenet)
-    if (ENET_FOUND)
-        add_library(enet::enet ALIAS PkgConfig::ENET)
-    endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(enet
-    REQUIRED_VARS ENET_LINK_LIBRARIES
-    VERSION_VAR ENET_VERSION
-)

externals/find-modules/Findhttplib.cmake

@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Andrea Pappacoda <andrea@pappacoda.it>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-include(FindPackageHandleStandardArgs)
-
-find_package(httplib QUIET CONFIG)
-if (httplib_FOUND)
-    find_package_handle_standard_args(httplib CONFIG_MODE)
-else()
-    find_package(PkgConfig QUIET)
-    if (PKG_CONFIG_FOUND)
-        pkg_search_module(HTTPLIB QUIET IMPORTED_TARGET GLOBAL cpp-httplib)
-        if (HTTPLIB_FOUND)
-            add_library(httplib::httplib ALIAS PkgConfig::HTTPLIB)
-        endif()
-    endif()
-    find_package_handle_standard_args(httplib
-        REQUIRED_VARS HTTPLIB_INCLUDEDIR
-        VERSION_VAR HTTPLIB_VERSION
-    )
-endif()

externals/find-modules/Findinih.cmake

@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_package(PkgConfig QUIET)
-if (PKG_CONFIG_FOUND)
-    pkg_search_module(INIREADER QUIET IMPORTED_TARGET GLOBAL INIReader)
-    if (INIREADER_FOUND)
-        add_library(inih::INIReader ALIAS PkgConfig::INIREADER)
-    endif()
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(inih
-    REQUIRED_VARS INIREADER_LINK_LIBRARIES
-    VERSION_VAR INIREADER_VERSION
-)

externals/find-modules/Findlz4.cmake

@@ -1,30 +1,19 @@
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-include(FindPackageHandleStandardArgs)
+find_package(PkgConfig)
 
-find_package(lz4 QUIET CONFIG)
-if (lz4_FOUND)
-    find_package_handle_standard_args(lz4 CONFIG_MODE)
-    if (NOT TARGET lz4::lz4)
-        if (TARGET LZ4::lz4_shared)
-            set_target_properties(LZ4::lz4_shared PROPERTIES IMPORTED_GLOBAL TRUE)
-            add_library(lz4::lz4 ALIAS LZ4::lz4_shared)
-        else()
-            set_target_properties(LZ4::lz4_static PROPERTIES IMPORTED_GLOBAL TRUE)
-            add_library(lz4::lz4 ALIAS LZ4::lz4_static)
-        endif()
+if (PKG_CONFIG_FOUND)
+    pkg_search_module(liblz4 IMPORTED_TARGET GLOBAL liblz4)
+    if (liblz4_FOUND)
+        add_library(lz4::lz4 ALIAS PkgConfig::liblz4)
     endif()
-else()
-    find_package(PkgConfig QUIET)
-    if (PKG_CONFIG_FOUND)
-        pkg_search_module(liblz4 QUIET IMPORTED_TARGET GLOBAL liblz4)
-        if (liblz4_FOUND)
-            add_library(lz4::lz4 ALIAS PkgConfig::liblz4)
-        endif()
-    endif()
-    find_package_handle_standard_args(lz4
-        REQUIRED_VARS liblz4_LINK_LIBRARIES
-        VERSION_VAR liblz4_VERSION
-    )
 endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(lz4
+    REQUIRED_VARS
+        liblz4_LINK_LIBRARIES
+        liblz4_FOUND
+    VERSION_VAR liblz4_VERSION
+)

externals/find-modules/Findzstd.cmake

@@ -1,30 +1,19 @@
 # SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-include(FindPackageHandleStandardArgs)
+find_package(PkgConfig)
 
-find_package(zstd QUIET CONFIG)
-if (zstd_FOUND)
-    find_package_handle_standard_args(zstd CONFIG_MODE)
-    if (NOT TARGET zstd::zstd)
-        if (TARGET zstd::libzstd_shared)
-            set_target_properties(zstd::libzstd_shared PROPERTIES IMPORTED_GLOBAL TRUE)
-            add_library(zstd::zstd ALIAS zstd::libzstd_shared)
-        else()
-            set_target_properties(zstd::libzstd_static PROPERTIES IMPORTED_GLOBAL TRUE)
-            add_library(zstd::zstd ALIAS zstd::libzstd_static)
-        endif()
+if (PKG_CONFIG_FOUND)
+    pkg_search_module(libzstd IMPORTED_TARGET GLOBAL libzstd)
+    if (libzstd_FOUND)
+        add_library(zstd::zstd ALIAS PkgConfig::libzstd)
     endif()
-else()
-    find_package(PkgConfig QUIET)
-    if (PKG_CONFIG_FOUND)
-        pkg_search_module(libzstd QUIET IMPORTED_TARGET GLOBAL libzstd)
-        if (libzstd_FOUND)
-            add_library(zstd::zstd ALIAS PkgConfig::libzstd)
-        endif()
-    endif()
-    find_package_handle_standard_args(zstd
-        REQUIRED_VARS libzstd_LINK_LIBRARIES
-        VERSION_VAR libzstd_VERSION
-    )
 endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(zstd
+    REQUIRED_VARS
+        libzstd_LINK_LIBRARIES
+        libzstd_FOUND
+    VERSION_VAR libzstd_VERSION
+)

externals/inih/CMakeLists.txt

@@ -9,5 +9,4 @@ add_library(inih
 )
 
 create_target_directory_groups(inih)
-target_include_directories(inih INTERFACE inih/cpp)
-add_library(inih::INIReader ALIAS inih)
+target_include_directories(inih INTERFACE .)

src/audio_core/CMakeLists.txt

@@ -219,11 +219,11 @@ endif()
 
 target_link_libraries(audio_core PUBLIC common core)
 if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
-    target_link_libraries(audio_core PRIVATE dynarmic::dynarmic)
+    target_link_libraries(audio_core PRIVATE dynarmic)
 endif()
 
 if(ENABLE_CUBEB)
-    target_link_libraries(audio_core PRIVATE cubeb::cubeb)
+    target_link_libraries(audio_core PRIVATE cubeb)
     target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1)
 endif()
 if(ENABLE_SDL2)

src/common/CMakeLists.txt

@@ -149,7 +149,7 @@ if(ARCHITECTURE_x86_64)
             x64/xbyak_abi.h
             x64/xbyak_util.h
     )
-    target_link_libraries(common PRIVATE xbyak::xbyak)
+    target_link_libraries(common PRIVATE xbyak)
 endif()
 
 if (MSVC)
@@ -174,7 +174,17 @@ endif()
 create_target_directory_groups(common)
 
 target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads)
-target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd)
+if (TARGET lz4::lz4)
+  target_link_libraries(common PRIVATE lz4::lz4)
+else()
+  target_link_libraries(common PRIVATE LZ4::lz4_shared)
+endif()
+if (TARGET zstd::zstd)
+  target_link_libraries(common PRIVATE zstd::zstd)
+else()
+  target_link_libraries(common PRIVATE
+    $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(common PRIVATE precompiled_headers.h)

src/core/CMakeLists.txt

@@ -824,7 +824,7 @@ if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
         hle/service/jit/jit.cpp
         hle/service/jit/jit.h
     )
-    target_link_libraries(core PRIVATE dynarmic::dynarmic)
+    target_link_libraries(core PRIVATE dynarmic)
 endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)

src/core/hle/kernel/k_memory_block.h

@@ -280,18 +280,19 @@ struct KMemoryInfo {
 
 class KMemoryBlock : public Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock> {
 private:
-    u16 m_device_disable_merge_left_count;
-    u16 m_device_disable_merge_right_count;
-    VAddr m_address;
-    size_t m_num_pages;
-    KMemoryState m_memory_state;
-    u16 m_ipc_lock_count;
-    u16 m_device_use_count;
-    u16 m_ipc_disable_merge_count;
-    KMemoryPermission m_permission;
-    KMemoryPermission m_original_permission;
-    KMemoryAttribute m_attribute;
-    KMemoryBlockDisableMergeAttribute m_disable_merge_attribute;
+    u16 m_device_disable_merge_left_count{};
+    u16 m_device_disable_merge_right_count{};
+    VAddr m_address{};
+    size_t m_num_pages{};
+    KMemoryState m_memory_state{KMemoryState::None};
+    u16 m_ipc_lock_count{};
+    u16 m_device_use_count{};
+    u16 m_ipc_disable_merge_count{};
+    KMemoryPermission m_permission{KMemoryPermission::None};
+    KMemoryPermission m_original_permission{KMemoryPermission::None};
+    KMemoryAttribute m_attribute{KMemoryAttribute::None};
+    KMemoryBlockDisableMergeAttribute m_disable_merge_attribute{
+        KMemoryBlockDisableMergeAttribute::None};
 
 public:
     static constexpr int Compare(const KMemoryBlock& lhs, const KMemoryBlock& rhs) {
@@ -367,12 +368,8 @@ public:
 
     constexpr KMemoryBlock(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p,
                            KMemoryAttribute attr)
-        : Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock>(),
-          m_device_disable_merge_left_count(), m_device_disable_merge_right_count(),
-          m_address(addr), m_num_pages(np), m_memory_state(ms), m_ipc_lock_count(0),
-          m_device_use_count(0), m_ipc_disable_merge_count(), m_permission(p),
-          m_original_permission(KMemoryPermission::None), m_attribute(attr),
-          m_disable_merge_attribute() {}
+        : Common::IntrusiveRedBlackTreeBaseNode<KMemoryBlock>(), m_address(addr), m_num_pages(np),
+          m_memory_state(ms), m_permission(p), m_attribute(attr) {}
 
     constexpr void Initialize(VAddr addr, size_t np, KMemoryState ms, KMemoryPermission p,
                               KMemoryAttribute attr) {

src/core/hle/kernel/k_memory_block_manager.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <array>
 #include <functional>
 
 #include "common/common_funcs.h"
@@ -17,9 +18,9 @@ public:
     static constexpr size_t MaxBlocks = 2;
 
 private:
-    KMemoryBlock* m_blocks[MaxBlocks];
-    size_t m_index;
-    KMemoryBlockSlabManager* m_slab_manager;
+    std::array<KMemoryBlock*, MaxBlocks> m_blocks{};
+    size_t m_index{MaxBlocks};
+    KMemoryBlockSlabManager* m_slab_manager{};
 
 private:
     Result Initialize(size_t num_blocks) {
@@ -41,7 +42,7 @@ private:
 public:
     KMemoryBlockManagerUpdateAllocator(Result* out_result, KMemoryBlockSlabManager* sm,
                                        size_t num_blocks = MaxBlocks)
-        : m_blocks(), m_index(MaxBlocks), m_slab_manager(sm) {
+        : m_slab_manager(sm) {
         *out_result = this->Initialize(num_blocks);
     }
 

src/core/hle/kernel/k_shared_memory.h

@@ -74,7 +74,7 @@ public:
     static void PostDestroy([[maybe_unused]] uintptr_t arg) {}
 
 private:
-    Core::DeviceMemory* device_memory;
+    Core::DeviceMemory* device_memory{};
     KProcess* owner_process{};
     KPageGroup page_list;
     Svc::MemoryPermission owner_permission{};

src/core/hle/kernel/k_thread.h

@@ -784,8 +784,8 @@ private:
     std::vector<KSynchronizationObject*> wait_objects_for_debugging;
     VAddr mutex_wait_address_for_debugging{};
     ThreadWaitReasonForDebugging wait_reason_for_debugging{};
-    uintptr_t argument;
-    VAddr stack_top;
+    uintptr_t argument{};
+    VAddr stack_top{};
 
 public:
     using ConditionVariableThreadTreeType = ConditionVariableThreadTree;

src/core/hle/kernel/kernel.cpp

@@ -891,7 +891,7 @@ struct KernelCore::Impl {
     Common::ThreadWorker service_threads_manager;
     Common::Barrier service_thread_barrier;
 
-    std::array<KThread*, Core::Hardware::NUM_CPU_CORES> shutdown_threads;
+    std::array<KThread*, Core::Hardware::NUM_CPU_CORES> shutdown_threads{};
     std::array<std::unique_ptr<Kernel::KScheduler>, Core::Hardware::NUM_CPU_CORES> schedulers{};
 
     bool is_multicore{};

src/core/hle/kernel/physical_core.h

@@ -85,7 +85,7 @@ private:
     std::mutex guard;
     std::condition_variable on_interrupt;
     std::unique_ptr<Core::ARM_Interface> arm_interface;
-    bool is_interrupted;
+    bool is_interrupted{};
 };
 
 } // namespace Kernel

src/network/CMakeLists.txt

@@ -19,7 +19,7 @@ add_library(network STATIC
 
 create_target_directory_groups(network)
 
-target_link_libraries(network PRIVATE common enet::enet Boost::boost)
+target_link_libraries(network PRIVATE common enet Boost::boost)
 if (ENABLE_WEB_SERVICE)
     target_compile_definitions(network PRIVATE -DENABLE_WEB_SERVICE)
     target_link_libraries(network PRIVATE web_service)

src/video_core/CMakeLists.txt

@@ -264,7 +264,8 @@ 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)
+target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include)
+target_link_libraries(video_core PRIVATE sirit)
 
 if (ENABLE_NSIGHT_AFTERMATH)
     if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})
@@ -304,11 +305,11 @@ if (ARCHITECTURE_x86_64)
         macro/macro_jit_x64.cpp
         macro/macro_jit_x64.h
     )
-    target_link_libraries(video_core PUBLIC xbyak::xbyak)
+    target_link_libraries(video_core PUBLIC xbyak)
 endif()
 
 if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
-    target_link_libraries(video_core PRIVATE dynarmic::dynarmic)
+    target_link_libraries(video_core PRIVATE dynarmic)
 endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)

src/video_core/vulkan_common/vulkan_device.cpp

@@ -86,8 +86,6 @@ constexpr std::array REQUIRED_EXTENSIONS{
 };
 
 constexpr std::array REQUIRED_EXTENSIONS_BEFORE_1_2{
-    VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME,
-    VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME,
     VK_KHR_8BIT_STORAGE_EXTENSION_NAME,
     VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME,
     VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME,

src/video_core/vulkan_common/vulkan_wrapper.cpp

@@ -454,12 +454,6 @@ VkResult Free(VkDevice device, VkCommandPool handle, Span<VkCommandBuffer> buffe
 
 Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char*> extensions,
                           InstanceDispatch& dispatch) {
-#ifdef __APPLE__
-    constexpr VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR};
-#else
-    constexpr VkFlags ci_flags{};
-#endif
-
     const VkApplicationInfo application_info{
         .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
         .pNext = nullptr,
@@ -472,7 +466,7 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char
     const VkInstanceCreateInfo ci{
         .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
         .pNext = nullptr,
-        .flags = ci_flags,
+        .flags = 0,
         .pApplicationInfo = &application_info,
         .enabledLayerCount = layers.size(),
         .ppEnabledLayerNames = layers.data(),

src/web_service/CMakeLists.txt

@@ -17,7 +17,7 @@ add_library(web_service STATIC
 )
 
 create_target_directory_groups(web_service)
-target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt::cpp-jwt)
+target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib cpp-jwt)
 
 if (YUZU_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(web_service PRIVATE precompiled_headers.h)

src/yuzu/CMakeLists.txt

@@ -318,7 +318,7 @@ target_link_libraries(yuzu PRIVATE common core input_common network video_core)
 target_link_libraries(yuzu PRIVATE Boost::boost glad Qt${QT_MAJOR_VERSION}::Widgets)
 target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
-target_link_libraries(yuzu PRIVATE Vulkan::Headers)
+target_include_directories(yuzu PRIVATE ../../externals/Vulkan-Headers/include)
 if (NOT WIN32)
     target_include_directories(yuzu PRIVATE ${Qt${QT_MAJOR_VERSION}Gui_PRIVATE_INCLUDE_DIRS})
 endif()
@@ -354,7 +354,7 @@ if (USE_DISCORD_PRESENCE)
         discord_impl.cpp
         discord_impl.h
     )
-    target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc)
+    target_link_libraries(yuzu PRIVATE discord-rpc)
     target_compile_definitions(yuzu PRIVATE -DUSE_DISCORD_PRESENCE)
 endif()
 
@@ -411,7 +411,7 @@ if (NOT APPLE)
 endif()
 
 if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
-    target_link_libraries(yuzu PRIVATE dynarmic::dynarmic)
+    target_link_libraries(yuzu PRIVATE dynarmic)
 endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)

src/yuzu_cmd/CMakeLists.txt

@@ -34,7 +34,7 @@ add_executable(yuzu-cmd
 create_target_directory_groups(yuzu-cmd)
 
 target_link_libraries(yuzu-cmd PRIVATE common core input_common)
-target_link_libraries(yuzu-cmd PRIVATE inih::INIReader glad)
+target_link_libraries(yuzu-cmd PRIVATE inih glad)
 if (MSVC)
     target_link_libraries(yuzu-cmd PRIVATE getopt)
 endif()
@@ -43,7 +43,7 @@ target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
 target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
 
-target_link_libraries(yuzu-cmd PRIVATE Vulkan::Headers)
+target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include)
 
 if (YUZU_USE_EXTERNAL_SDL2)
     target_link_libraries(yuzu-cmd PRIVATE SDL2-static)

src/yuzu_cmd/config.cpp

@@ -15,7 +15,7 @@
 #pragma clang diagnostic pop
 #endif
 
-#include <INIReader.h>
+#include <inih/cpp/INIReader.h>
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"