Update translations (2023-08-01)

2023-08-01 02:28:01 +00:00
1029 changed files with 61417 additions and 99106 deletions
@@ -8,17 +8,8 @@ ccache -s

 BUILD_FLAVOR=mainline

-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
-    base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
-fi
-
 cd src/android
 chmod +x ./gradlew
 ./gradlew "assemble${BUILD_FLAVOR}Release" "bundle${BUILD_FLAVOR}Release"

 ccache -s
-
-if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
-    rm "${ANDROID_KEYSTORE_FILE}"
-fi
@@ -13,3 +13,15 @@ cp src/android/app/build/outputs/apk/"${BUILD_FLAVOR}/release/app-${BUILD_FLAVOR
  "artifacts/${REV_NAME}.apk"
 cp src/android/app/build/outputs/bundle/"${BUILD_FLAVOR}Release"/"app-${BUILD_FLAVOR}-release.aab" \
  "artifacts/${REV_NAME}.aab"
+
+if [ -n "${ANDROID_KEYSTORE_B64}" ]
+then
+  echo "Signing apk..."
+  base64 --decode <<< "${ANDROID_KEYSTORE_B64}" > ks.jks
+
+  apksigner sign --ks ks.jks \
+    --ks-key-alias "${ANDROID_KEY_ALIAS}" \
+    --ks-pass env:ANDROID_KEYSTORE_PASS "artifacts/${REV_NAME}.apk"
+else
+  echo "No keystore specified, not signing the APK files."
+fi
@@ -19,7 +19,6 @@ cmake .. \
      -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
      -DENABLE_QT_TRANSLATION=ON \
      -DUSE_DISCORD_PRESENCE=ON \
-      -DYUZU_CRASH_DUMPS=ON \
      -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
      -DYUZU_USE_BUNDLED_FFMPEG=ON \
      -GNinja
@@ -5,6 +5,6 @@

 GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
-ARTIFACTS_DIR="$PWD/artifacts"
+ARTIFACTS_DIR="artifacts"

 mkdir -p "${ARTIFACTS_DIR}/"
@@ -11,7 +11,7 @@ ccache -s
 mkdir build || true && cd build
 cmake .. \
      -DBoost_USE_STATIC_LIBS=ON \
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_BUILD_TYPE=Release \
      -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
      -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
      -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
@@ -23,7 +23,6 @@ cmake .. \
      -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \
      -DYUZU_USE_BUNDLED_FFMPEG=ON \
      -DYUZU_ENABLE_LTO=ON \
-      -DYUZU_CRASH_DUMPS=ON \
      -GNinja

 ninja
@@ -32,19 +31,6 @@ ccache -s

 ctest -VV -C Release

-# Separate debug symbols from specified executables
-for EXE in yuzu; do
-    EXE_PATH="bin/$EXE"
-    # Copy debug symbols out
-    objcopy --only-keep-debug $EXE_PATH $EXE_PATH.debug
-    # Add debug link and strip debug symbols
-    objcopy -g --add-gnu-debuglink=$EXE_PATH.debug $EXE_PATH $EXE_PATH.out
-    # Overwrite original with stripped copy
-    mv $EXE_PATH.out $EXE_PATH
-done
-# Strip debug symbols from all executables
-find bin/ -type f -not -regex '.*.debug' -exec strip -g {} ';'
-
 DESTDIR="$PWD/AppDir" ninja install
 rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester

@@ -59,9 +59,4 @@ if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ];
    cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/yuzu-${RELEASE_NAME}.AppImage"
 fi

-# Copy debug symbols to artifacts
-cd build/bin
-tar $COMPRESSION_FLAGS "${ARTIFACTS_DIR}/${REV_NAME}-debug.tar.xz" *.debug
-cd -
-
 . .ci/scripts/common/post-upload.sh
@@ -17,6 +17,7 @@ cmake .. \
    -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
    -DENABLE_QT_TRANSLATION=ON \
    -DUSE_CCACHE=ON \
+    -DYUZU_CRASH_DUMPS=ON \
    -DYUZU_USE_BUNDLED_SDL2=OFF \
    -DYUZU_USE_EXTERNAL_SDL2=OFF \
    -DYUZU_TESTS=OFF \
@@ -3,4 +3,4 @@

 [codespell]
 skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES,./src/android/app/src/main/res
-ignore-words-list = aci,allright,ba,canonicalizations,deques,froms,hda,inout,lod,masia,nam,nax,nd,optin,pullrequests,pullrequest,te,transfered,unstall,uscaled,vas,zink
+ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nam,nax,nd,optin,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink
@@ -32,7 +32,7 @@
 	path = externals/xbyak
 	url = https://github.com/herumi/xbyak.git
 [submodule "opus"]
-	path = externals/opus
+	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git
 [submodule "SDL"]
 	path = externals/SDL
@@ -58,6 +58,3 @@
 [submodule "VulkanMemoryAllocator"]
 	path = externals/VulkanMemoryAllocator
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-[submodule "breakpad"]
-	path = externals/breakpad
-	url = https://github.com/yuzu-emu/breakpad.git
@@ -147,7 +147,3 @@ License: GPL-3.0-or-later
 Files: src/android/gradle/wrapper/*
 Copyright: 2023 yuzu Emulator Project
 License: GPL-3.0-or-later
-
-Files: externals/stb/*
-Copyright: Sean Barrett
-License: MIT
@@ -11,6 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modul
 include(DownloadExternals)
 include(CMakeDependentOption)
 include(CTest)
+include(FetchContent)

 # Set bundled sdl2/qt as dependent options.
 # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
@@ -48,11 +49,9 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")

 option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)

-option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
+cmake_dependent_option(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)

-CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
-
-CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
+CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)

 option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}")

@@ -62,12 +61,8 @@ option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)

 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)

-option(YUZU_ENABLE_PORTABLE "Allow yuzu to enable portable mode if a user folder is found in the CWD" ON)
-
 CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)

-CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
-
 set(DEFAULT_ENABLE_OPENSSL ON)
 if (ANDROID OR WIN32 OR APPLE)
    # - Windows defaults to the Schannel backend.
@@ -80,26 +75,47 @@ if (ANDROID OR WIN32 OR APPLE)
 endif()
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})

-if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
-    set(vvl_version "sdk-1.3.261.1")
-    set(vvl_zip_file "${CMAKE_BINARY_DIR}/externals/vvl-android.zip")
-    if (NOT EXISTS "${vvl_zip_file}")
-        # Download and extract validation layer release to externals directory
-        set(vvl_base_url "https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download")
-        file(DOWNLOAD "${vvl_base_url}/${vvl_version}/android-binaries-${vvl_version}-android.zip"
-            "${vvl_zip_file}" SHOW_PROGRESS)
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${vvl_zip_file}"
-                        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
-    endif()
-
-    # Copy the arm64 binary to src/android/app/main/jniLibs
-    set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/arm64-v8a/")
-    file(COPY "${CMAKE_BINARY_DIR}/externals/android-binaries-${vvl_version}/arm64-v8a/libVkLayer_khronos_validation.so"
-            DESTINATION "${vvl_lib_path}")
-endif()
-
+# On Android, fetch and compile libcxx before doing anything else
 if (ANDROID)
    set(CMAKE_SKIP_INSTALL_RULES ON)
+    set(LLVM_VERSION "15.0.6")
+
+    # Note: even though libcxx and libcxxabi have separate releases on the project page,
+    # the separated releases cannot be compiled. Only in-tree builds work. Therefore we
+    # must fetch the source release for the entire llvm tree.
+    FetchContent_Declare(llvm
+        URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz"
+        URL_HASH SHA256=9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92
+        TLS_VERIFY TRUE
+    )
+    FetchContent_MakeAvailable(llvm)
+
+    # libcxx has support for most of the range library, but it's gated behind a flag:
+    add_compile_definitions(_LIBCPP_ENABLE_EXPERIMENTAL)
+
+    # Disable standard header inclusion
+    set(ANDROID_STL "none")
+
+    # libcxxabi
+    set(LIBCXXABI_INCLUDE_TESTS OFF)
+    set(LIBCXXABI_ENABLE_SHARED FALSE)
+    set(LIBCXXABI_ENABLE_STATIC TRUE)
+    set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING "" FORCE)
+    add_subdirectory("${llvm_SOURCE_DIR}/libcxxabi" "${llvm_BINARY_DIR}/libcxxabi")
+    link_libraries(cxxabi_static)
+
+    # libcxx
+    set(LIBCXX_ABI_NAMESPACE "__ndk1" CACHE STRING "" FORCE)
+    set(LIBCXX_CXX_ABI "libcxxabi")
+    set(LIBCXX_INCLUDE_TESTS OFF)
+    set(LIBCXX_INCLUDE_BENCHMARKS OFF)
+    set(LIBCXX_INCLUDE_DOCS OFF)
+    set(LIBCXX_ENABLE_SHARED FALSE)
+    set(LIBCXX_ENABLE_STATIC TRUE)
+    set(LIBCXX_ENABLE_ASSERTIONS FALSE)
+    add_subdirectory("${llvm_SOURCE_DIR}/libcxx" "${llvm_BINARY_DIR}/libcxx")
+    set_target_properties(cxx-headers PROPERTIES INTERFACE_COMPILE_OPTIONS "-isystem${CMAKE_BINARY_DIR}/${LIBCXX_INSTALL_INCLUDE_DIR}")
+    link_libraries(cxx_static cxx-headers)
 endif()

 if (YUZU_USE_BUNDLED_VCPKG)
@@ -139,6 +155,9 @@ if (YUZU_USE_BUNDLED_VCPKG)
    if (YUZU_TESTS)
        list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")
    endif()
+    if (YUZU_CRASH_DUMPS)
+        list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp")
+    endif()
    if (ENABLE_WEB_SERVICE)
        list(APPEND VCPKG_MANIFEST_FEATURES "web-service")
    endif()
@@ -286,12 +305,10 @@ find_package(Boost 1.79.0 REQUIRED context)
 find_package(enet 1.3 MODULE)
 find_package(fmt 9 REQUIRED)
 find_package(inih 52 MODULE COMPONENTS INIReader)
-find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle)
+find_package(LLVM 17 MODULE COMPONENTS Demangle)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
-find_package(RenderDoc MODULE)
-find_package(stb MODULE)
 find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
 find_package(zstd 1.5 REQUIRED)
@@ -358,9 +375,6 @@ function(set_yuzu_qt_components)
    if (ENABLE_QT_TRANSLATION)
        list(APPEND YUZU_QT_COMPONENTS2 LinguistTools)
    endif()
-    if (USE_DISCORD_PRESENCE)
-        list(APPEND YUZU_QT_COMPONENTS2 Network)
-    endif()
    set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
 endfunction(set_yuzu_qt_components)

@@ -508,7 +522,7 @@ if (ENABLE_SDL2)
    if (YUZU_USE_BUNDLED_SDL2)
        # Detect toolchain and platform
        if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.28.2")
+            set(SDL2_VER "SDL2-2.28.1")
        else()
            message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
        endif()
@@ -548,18 +562,6 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG)
    find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS})
 endif()

-if (WIN32 AND YUZU_CRASH_DUMPS)
-    set(BREAKPAD_VER "breakpad-c89f9dd")
-    download_bundled_external("breakpad/" ${BREAKPAD_VER} BREAKPAD_PREFIX)
-
-    set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
-    set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
-
-    add_library(libbreakpad_client INTERFACE IMPORTED)
-    target_link_libraries(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_LIBRARY}")
-    target_include_directories(libbreakpad_client INTERFACE "${BREAKPAD_CLIENT_INCLUDE_DIR}")
-endif()
-
 # Prefer the -pthread flag on Linux.
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
@@ -579,6 +581,13 @@ elseif (WIN32)
        # PSAPI is the Process Status API
        set(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)
    endif()
+
+    if (YUZU_CRASH_DUMPS)
+        find_library(DBGHELP_LIBRARY dbghelp)
+        if ("${DBGHELP_LIBRARY}" STREQUAL "DBGHELP_LIBRARY-NOTFOUND")
+            message(FATAL_ERROR "YUZU_CRASH_DUMPS enabled but dbghelp library not found")
+        endif()
+    endif()
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
    set(PLATFORM_LIBRARIES rt)
 endif()
@@ -36,21 +36,3 @@ endif()
 message(STATUS "Using bundled binaries at ${prefix}")
 set(${prefix_var} "${prefix}" PARENT_SCOPE)
 endfunction()
-
-function(download_moltenvk_external platform version)
-    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
-    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
-    if (NOT EXISTS ${MOLTENVK_DIR})
-        if (NOT EXISTS ${MOLTENVK_TAR})
-            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar
-                ${MOLTENVK_TAR} SHOW_PROGRESS)
-        endif()
-
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
-    endif()
-
-    # Add the MoltenVK library path to the prefix so find_library can locate it.
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-endfunction()
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_path(RenderDoc_INCLUDE_DIR renderdoc_app.h)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(RenderDoc
-    REQUIRED_VARS RenderDoc_INCLUDE_DIR
-)
-
-if (RenderDoc_FOUND AND NOT TARGET RenderDoc::API)
-    add_library(RenderDoc::API INTERFACE IMPORTED)
-    set_target_properties(RenderDoc::API PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${RenderDoc_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(RenderDoc_INCLUDE_DIR)
@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_path(stb_image_INCLUDE_DIR stb_image.h PATH_SUFFIXES stb)
-find_path(stb_image_resize_INCLUDE_DIR stb_image_resize.h PATH_SUFFIXES stb)
-find_path(stb_image_write_INCLUDE_DIR stb_image_write.h PATH_SUFFIXES stb)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(stb
-    REQUIRED_VARS
-        stb_image_INCLUDE_DIR
-        stb_image_resize_INCLUDE_DIR
-        stb_image_write_INCLUDE_DIR
-)
-
-if (stb_FOUND AND NOT TARGET stb::headers)
-    add_library(stb::headers INTERFACE IMPORTED)
-    set_property(TARGET stb::headers PROPERTY
-        INTERFACE_INCLUDE_DIRECTORIES
-            "${stb_image_INCLUDE_DIR}"
-            "${stb_image_resize_INCLUDE_DIR}"
-            "${stb_image_write_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(
-    stb_image_INCLUDE_DIR
-    stb_image_resize_INCLUDE_DIR
-    stb_image_write_INCLUDE_DIR
-)
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2019 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later

-# Gets a UTC timestamp and sets the provided variable to it
+# Gets a UTC timstamp and sets the provided variable to it
 function(get_timestamp _var)
    string(TIMESTAMP timestamp UTC)
    set(${_var} "${timestamp}" PARENT_SCOPE)
@@ -40,7 +40,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f

 The emulator is capable of running most commercial games at full speed, provided you meet the [necessary hardware requirements](https://yuzu-emu.org/help/quickstart/#hardware-requirements).

-For a full list of games yuzu supports, please visit our [Compatibility page](https://yuzu-emu.org/game/).
+For a full list of games yuzu support, please visit our [Compatibility page](https://yuzu-emu.org/game/)

 Check out our [website](https://yuzu-emu.org/) for the latest news on exciting features, monthly progress reports, and more!

@@ -13,4 +13,3 @@ Exec=yuzu %f
 Categories=Game;Emulator;Qt;
 MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
 Keywords=Nintendo;Switch;
-StartupWMClass=yuzu
@@ -78,11 +78,6 @@ QPushButton#buttonRefreshDevices {
    max-height: 21px;
 }

-QPushButton#button_reset_defaults {
-    min-width: 57px;
-    padding: 4px 8px;
-}
-
 QWidget#bottomPerGameInput,
 QWidget#topControllerApplet,
 QWidget#bottomControllerApplet,
@@ -120,10 +115,6 @@ QWidget#connectedControllers {
    background: transparent;
 }

-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -1380,10 +1380,6 @@ QWidget#connectedControllers {
    background: transparent;
 }

-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -2228,10 +2228,6 @@ QPushButton#buttonRefreshDevices {
  padding: 0px 0px;
 }

-QPushButton#button_reset_defaults {
-    padding: 3px 6px;
-}
-
 QSpinBox#spinboxLStickRange,
 QSpinBox#spinboxRStickRange,
 QSpinBox#vibrationSpinPlayer1,
@@ -2305,10 +2301,6 @@ QWidget#connectedControllers {
  background: transparent;
 }

-QWidget#closeButtons {
-    background: transparent;
-}
-
 QWidget#playersSupported,
 QWidget#controllersSupported,
 QWidget#controllerSupported1,
@@ -42,11 +42,6 @@ endif()
 # mbedtls
 add_subdirectory(mbedtls)
 target_include_directories(mbedtls PUBLIC ./mbedtls/include)
-if (NOT MSVC)
-    target_compile_options(mbedcrypto PRIVATE
-        -Wno-unused-but-set-variable
-        -Wno-string-concatenation)
-endif()

 # MicroProfile
 add_library(microprofile INTERFACE)
@@ -99,12 +94,6 @@ if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb)
    set(BUILD_TOOLS OFF)
    add_subdirectory(cubeb)
    add_library(cubeb::cubeb ALIAS cubeb)
-    if (NOT MSVC)
-        if (TARGET speex)
-            target_compile_options(speex PRIVATE -Wno-sign-compare)
-        endif()
-        target_compile_options(cubeb PRIVATE -Wno-implicit-const-int-float-conversion)
-    endif()
 endif()

 # DiscordRPC
@@ -134,10 +123,6 @@ endif()

 # Opus
 if (NOT TARGET Opus::opus)
-    set(OPUS_BUILD_TESTING OFF)
-    set(OPUS_BUILD_PROGRAMS OFF)
-    set(OPUS_INSTALL_PKG_CONFIG_MODULE OFF)
-    set(OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF)
    add_subdirectory(opus)
 endif()

@@ -166,132 +151,17 @@ endif()
 if (NOT TARGET LLVM::Demangle)
    add_library(demangle demangle/ItaniumDemangle.cpp)
    target_include_directories(demangle PUBLIC ./demangle)
-    if (NOT MSVC)
-        target_compile_options(demangle PRIVATE -Wno-deprecated-declarations) # std::is_pod
-    endif()
    add_library(LLVM::Demangle ALIAS demangle)
 endif()

 add_library(stb stb/stb_dxt.cpp)
 target_include_directories(stb PUBLIC ./stb)

-if (NOT TARGET stb::headers)
-    add_library(stb::headers ALIAS stb)
-endif()
-
 add_library(bc_decoder bc_decoder/bc_decoder.cpp)
 target_include_directories(bc_decoder PUBLIC ./bc_decoder)

-if (NOT TARGET RenderDoc::API)
-    add_library(renderdoc INTERFACE)
-    target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
-    add_library(RenderDoc::API ALIAS renderdoc)
-endif()
-
 if (ANDROID)
   if (ARCHITECTURE_arm64)
       add_subdirectory(libadrenotools)
   endif()
 endif()
-
-# Breakpad
-# https://github.com/microsoft/vcpkg/blob/master/ports/breakpad/CMakeLists.txt
-if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
-    set(BREAKPAD_WIN32_DEFINES
-        NOMINMAX
-        UNICODE
-        WIN32_LEAN_AND_MEAN
-        _CRT_SECURE_NO_WARNINGS
-        _CRT_SECURE_NO_DEPRECATE
-        _CRT_NONSTDC_NO_DEPRECATE
-    )
-
-    # libbreakpad
-    add_library(libbreakpad STATIC)
-    file(GLOB_RECURSE LIBBREAKPAD_SOURCES breakpad/src/processor/*.cc)
-    file(GLOB_RECURSE LIBDISASM_SOURCES breakpad/src/third_party/libdisasm/*.c)
-    list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "_unittest|_selftest|synth_minidump|/tests|/testdata|/solaris|microdump_stackwalk|minidump_dump|minidump_stackwalk")
-    if (WIN32)
-        list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "/linux|/mac|/android")
-        target_compile_definitions(libbreakpad PRIVATE ${BREAKPAD_WIN32_DEFINES})
-        target_include_directories(libbreakpad PRIVATE "${CMAKE_GENERATOR_INSTANCE}/DIA SDK/include")
-    elseif (APPLE)
-        list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "/linux|/windows|/android")
-    else()
-        list(FILTER LIBBREAKPAD_SOURCES EXCLUDE REGEX "/mac|/windows|/android")
-    endif()
-    target_sources(libbreakpad PRIVATE ${LIBBREAKPAD_SOURCES} ${LIBDISASM_SOURCES})
-    target_include_directories(libbreakpad
-        PUBLIC
-            ${CMAKE_CURRENT_SOURCE_DIR}/breakpad/src
-            ${CMAKE_CURRENT_SOURCE_DIR}/breakpad/src/third_party/libdisasm
-    )
-
-    # libbreakpad_client
-    add_library(libbreakpad_client STATIC)
-    file(GLOB LIBBREAKPAD_COMMON_SOURCES breakpad/src/common/*.cc breakpad/src/common/*.c breakpad/src/client/*.cc)
-
-    if (WIN32)
-        file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES breakpad/src/client/windows/*.cc breakpad/src/common/windows/*.cc)
-        list(FILTER LIBBREAKPAD_COMMON_SOURCES EXCLUDE REGEX "language.cc|path_helper.cc|stabs_to_module.cc|stabs_reader.cc|minidump_file_writer.cc")
-        target_include_directories(libbreakpad_client PRIVATE "${CMAKE_GENERATOR_INSTANCE}/DIA SDK/include")
-        target_compile_definitions(libbreakpad_client PRIVATE ${BREAKPAD_WIN32_DEFINES})
-    elseif (APPLE)
-        target_compile_definitions(libbreakpad_client PRIVATE HAVE_MACH_O_NLIST_H)
-        file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES breakpad/src/client/mac/*.cc breakpad/src/common/mac/*.cc)
-        list(APPEND LIBBREAKPAD_CLIENT_SOURCES breakpad/src/common/mac/MachIPC.mm)
-    else()
-        target_compile_definitions(libbreakpad_client PUBLIC -DHAVE_A_OUT_H)
-        file(GLOB_RECURSE LIBBREAKPAD_CLIENT_SOURCES breakpad/src/client/linux/*.cc breakpad/src/common/linux/*.cc)
-    endif()
-    list(APPEND LIBBREAKPAD_CLIENT_SOURCES ${LIBBREAKPAD_COMMON_SOURCES})
-    list(FILTER LIBBREAKPAD_CLIENT_SOURCES EXCLUDE REGEX "/sender|/tests|/unittests|/testcases|_unittest|_test")
-    target_sources(libbreakpad_client PRIVATE ${LIBBREAKPAD_CLIENT_SOURCES})
-    target_include_directories(libbreakpad_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/breakpad/src)
-
-    if (WIN32)
-        target_link_libraries(libbreakpad_client PRIVATE wininet.lib)
-    elseif (APPLE)
-        find_library(CoreFoundation_FRAMEWORK CoreFoundation)
-        target_link_libraries(libbreakpad_client PRIVATE ${CoreFoundation_FRAMEWORK})
-    else()
-        find_library(PTHREAD_LIBRARIES pthread)
-        target_compile_definitions(libbreakpad_client PRIVATE HAVE_GETCONTEXT=1)
-        if (PTHREAD_LIBRARIES)
-            target_link_libraries(libbreakpad_client PRIVATE ${PTHREAD_LIBRARIES})
-        endif()
-    endif()
-
-    # Host tools for symbol processing
-    if (LINUX)
-        find_package(ZLIB REQUIRED)
-
-        add_executable(minidump_stackwalk breakpad/src/processor/minidump_stackwalk.cc)
-        target_link_libraries(minidump_stackwalk PRIVATE libbreakpad libbreakpad_client)
-
-        add_executable(dump_syms
-            breakpad/src/common/dwarf_cfi_to_module.cc
-            breakpad/src/common/dwarf_cu_to_module.cc
-            breakpad/src/common/dwarf_line_to_module.cc
-            breakpad/src/common/dwarf_range_list_handler.cc
-            breakpad/src/common/language.cc
-            breakpad/src/common/module.cc
-            breakpad/src/common/path_helper.cc
-            breakpad/src/common/stabs_reader.cc
-            breakpad/src/common/stabs_to_module.cc
-            breakpad/src/common/dwarf/bytereader.cc
-            breakpad/src/common/dwarf/dwarf2diehandler.cc
-            breakpad/src/common/dwarf/dwarf2reader.cc
-            breakpad/src/common/dwarf/elf_reader.cc
-            breakpad/src/common/linux/crc32.cc
-            breakpad/src/common/linux/dump_symbols.cc
-            breakpad/src/common/linux/elf_symbols_to_module.cc
-            breakpad/src/common/linux/elfutils.cc
-            breakpad/src/common/linux/file_id.cc
-            breakpad/src/common/linux/linux_libc_support.cc
-            breakpad/src/common/linux/memory_mapped_file.cc
-            breakpad/src/common/linux/safe_readlink.cc
-            breakpad/src/tools/linux/dump_syms/dump_syms.cc)
-        target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB)
-    endif()
-endif()
@@ -164,7 +164,7 @@ if (NOT WIN32 AND NOT ANDROID)
                --enable-decoder=h264
                --enable-decoder=vp8
                --enable-decoder=vp9
-                --enable-filter=yadif,scale
+                --enable-filter=yadif
                --cc="${FFmpeg_CC}"
                --cxx="${FFmpeg_CXX}"
                ${FFmpeg_HWACCEL_FLAGS}
@@ -254,7 +254,7 @@ elseif(ANDROID)
    set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
 elseif(WIN32)
    # Use yuzu FFmpeg binaries
-    set(FFmpeg_EXT_NAME "ffmpeg-6.0")
+    set(FFmpeg_EXT_NAME "ffmpeg-5.1.3")
    set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
    download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
    set(FFmpeg_FOUND YES)
@@ -49,6 +49,11 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE)

    set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE)

+    # MINGW: causes "externals/libusb/libusb/libusb/os/windows_winusb.c:1427:2: error: conversion to non-scalar type requested", so cannot statically link it for now.
+    if (NOT MINGW)
+        set(LIBUSB_CFLAGS "-DGUID_DEVINTERFACE_USB_DEVICE=\\(GUID\\){0xA5DCBF10,0x6530,0x11D2,{0x90,0x1F,0x00,0xC0,0x4F,0xB9,0x51,0xED}}")
+    endif()
+
    make_directory("${LIBUSB_PREFIX}")

    add_custom_command(
@@ -141,6 +146,8 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
            target_include_directories(usb BEFORE PRIVATE libusb/msvc)
        endif()

+        # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2)
+        target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}")
    else()
        target_include_directories(usb
            # turns out other projects also have "config.h", so make sure the
@@ -27,7 +27,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
    set(CAN_BUILD_NX_TZDB false)
 endif()

-set(NX_TZDB_VERSION "221202")
+set(NX_TZDB_VERSION "220816")
 set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")

 set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
@@ -0,0 +1,259 @@
+# SPDX-FileCopyrightText: 2019 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+cmake_minimum_required(VERSION 3.8)
+
+project(opus)
+
+option(OPUS_STACK_PROTECTOR "Use stack protection" OFF)
+option(OPUS_USE_ALLOCA "Use alloca for stack arrays (on non-C99 compilers)" OFF)
+option(OPUS_CUSTOM_MODES "Enable non-Opus modes, e.g. 44.1 kHz & 2^n frames" OFF)
+option(OPUS_FIXED_POINT "Compile as fixed-point (for machines without a fast enough FPU)" OFF)
+option(OPUS_ENABLE_FLOAT_API "Compile with the floating point API (for machines with float library" ON)
+
+include(opus/opus_functions.cmake)
+
+if(OPUS_STACK_PROTECTOR)
+    if(NOT MSVC) # GC on by default on MSVC
+        check_and_set_flag(STACK_PROTECTION_STRONG -fstack-protector-strong)
+    endif()
+else()
+    if(MSVC)
+        check_and_set_flag(BUFFER_SECURITY_CHECK /GS-)
+    endif()
+endif()
+
+add_library(opus
+    # CELT sources
+    opus/celt/bands.c
+    opus/celt/celt.c
+    opus/celt/celt_decoder.c
+    opus/celt/celt_encoder.c
+    opus/celt/celt_lpc.c
+    opus/celt/cwrs.c
+    opus/celt/entcode.c
+    opus/celt/entdec.c
+    opus/celt/entenc.c
+    opus/celt/kiss_fft.c
+    opus/celt/laplace.c
+    opus/celt/mathops.c
+    opus/celt/mdct.c
+    opus/celt/modes.c
+    opus/celt/pitch.c
+    opus/celt/quant_bands.c
+    opus/celt/rate.c
+    opus/celt/vq.c
+
+    # SILK sources
+    opus/silk/A2NLSF.c
+    opus/silk/CNG.c
+    opus/silk/HP_variable_cutoff.c
+    opus/silk/LPC_analysis_filter.c
+    opus/silk/LPC_fit.c
+    opus/silk/LPC_inv_pred_gain.c
+    opus/silk/LP_variable_cutoff.c
+    opus/silk/NLSF2A.c
+    opus/silk/NLSF_VQ.c
+    opus/silk/NLSF_VQ_weights_laroia.c
+    opus/silk/NLSF_decode.c
+    opus/silk/NLSF_del_dec_quant.c
+    opus/silk/NLSF_encode.c
+    opus/silk/NLSF_stabilize.c
+    opus/silk/NLSF_unpack.c
+    opus/silk/NSQ.c
+    opus/silk/NSQ_del_dec.c
+    opus/silk/PLC.c
+    opus/silk/VAD.c
+    opus/silk/VQ_WMat_EC.c
+    opus/silk/ana_filt_bank_1.c
+    opus/silk/biquad_alt.c
+    opus/silk/bwexpander.c
+    opus/silk/bwexpander_32.c
+    opus/silk/check_control_input.c
+    opus/silk/code_signs.c
+    opus/silk/control_SNR.c
+    opus/silk/control_audio_bandwidth.c
+    opus/silk/control_codec.c
+    opus/silk/dec_API.c
+    opus/silk/decode_core.c
+    opus/silk/decode_frame.c
+    opus/silk/decode_indices.c
+    opus/silk/decode_parameters.c
+    opus/silk/decode_pitch.c
+    opus/silk/decode_pulses.c
+    opus/silk/decoder_set_fs.c
+    opus/silk/enc_API.c
+    opus/silk/encode_indices.c
+    opus/silk/encode_pulses.c
+    opus/silk/gain_quant.c
+    opus/silk/init_decoder.c
+    opus/silk/init_encoder.c
+    opus/silk/inner_prod_aligned.c
+    opus/silk/interpolate.c
+    opus/silk/lin2log.c
+    opus/silk/log2lin.c
+    opus/silk/pitch_est_tables.c
+    opus/silk/process_NLSFs.c
+    opus/silk/quant_LTP_gains.c
+    opus/silk/resampler.c
+    opus/silk/resampler_down2.c
+    opus/silk/resampler_down2_3.c
+    opus/silk/resampler_private_AR2.c
+    opus/silk/resampler_private_IIR_FIR.c
+    opus/silk/resampler_private_down_FIR.c
+    opus/silk/resampler_private_up2_HQ.c
+    opus/silk/resampler_rom.c
+    opus/silk/shell_coder.c
+    opus/silk/sigm_Q15.c
+    opus/silk/sort.c
+    opus/silk/stereo_LR_to_MS.c
+    opus/silk/stereo_MS_to_LR.c
+    opus/silk/stereo_decode_pred.c
+    opus/silk/stereo_encode_pred.c
+    opus/silk/stereo_find_predictor.c
+    opus/silk/stereo_quant_pred.c
+    opus/silk/sum_sqr_shift.c
+    opus/silk/table_LSF_cos.c
+    opus/silk/tables_LTP.c
+    opus/silk/tables_NLSF_CB_NB_MB.c
+    opus/silk/tables_NLSF_CB_WB.c
+    opus/silk/tables_gain.c
+    opus/silk/tables_other.c
+    opus/silk/tables_pitch_lag.c
+    opus/silk/tables_pulses_per_block.c
+
+    # Opus sources
+    opus/src/analysis.c
+    opus/src/mapping_matrix.c
+    opus/src/mlp.c
+    opus/src/mlp_data.c
+    opus/src/opus.c
+    opus/src/opus_decoder.c
+    opus/src/opus_encoder.c
+    opus/src/opus_multistream.c
+    opus/src/opus_multistream_decoder.c
+    opus/src/opus_multistream_encoder.c
+    opus/src/opus_projection_decoder.c
+    opus/src/opus_projection_encoder.c
+    opus/src/repacketizer.c
+)
+
+if (DEBUG)
+    target_sources(opus PRIVATE opus/silk/debug.c)
+endif()
+
+if (OPUS_FIXED_POINT)
+    target_sources(opus PRIVATE
+        opus/silk/fixed/LTP_analysis_filter_FIX.c
+        opus/silk/fixed/LTP_scale_ctrl_FIX.c
+        opus/silk/fixed/apply_sine_window_FIX.c
+        opus/silk/fixed/autocorr_FIX.c
+        opus/silk/fixed/burg_modified_FIX.c
+        opus/silk/fixed/corrMatrix_FIX.c
+        opus/silk/fixed/encode_frame_FIX.c
+        opus/silk/fixed/find_LPC_FIX.c
+        opus/silk/fixed/find_LTP_FIX.c
+        opus/silk/fixed/find_pitch_lags_FIX.c
+        opus/silk/fixed/find_pred_coefs_FIX.c
+        opus/silk/fixed/k2a_FIX.c
+        opus/silk/fixed/k2a_Q16_FIX.c
+        opus/silk/fixed/noise_shape_analysis_FIX.c
+        opus/silk/fixed/pitch_analysis_core_FIX.c
+        opus/silk/fixed/prefilter_FIX.c
+        opus/silk/fixed/process_gains_FIX.c
+        opus/silk/fixed/regularize_correlations_FIX.c
+        opus/silk/fixed/residual_energy16_FIX.c
+        opus/silk/fixed/residual_energy_FIX.c
+        opus/silk/fixed/schur64_FIX.c
+        opus/silk/fixed/schur_FIX.c
+        opus/silk/fixed/solve_LS_FIX.c
+        opus/silk/fixed/vector_ops_FIX.c
+        opus/silk/fixed/warped_autocorrelation_FIX.c
+    )
+else()
+    target_sources(opus PRIVATE
+        opus/silk/float/LPC_analysis_filter_FLP.c
+        opus/silk/float/LPC_inv_pred_gain_FLP.c
+        opus/silk/float/LTP_analysis_filter_FLP.c
+        opus/silk/float/LTP_scale_ctrl_FLP.c
+        opus/silk/float/apply_sine_window_FLP.c
+        opus/silk/float/autocorrelation_FLP.c
+        opus/silk/float/burg_modified_FLP.c
+        opus/silk/float/bwexpander_FLP.c
+        opus/silk/float/corrMatrix_FLP.c
+        opus/silk/float/encode_frame_FLP.c
+        opus/silk/float/energy_FLP.c
+        opus/silk/float/find_LPC_FLP.c
+        opus/silk/float/find_LTP_FLP.c
+        opus/silk/float/find_pitch_lags_FLP.c
+        opus/silk/float/find_pred_coefs_FLP.c
+        opus/silk/float/inner_product_FLP.c
+        opus/silk/float/k2a_FLP.c
+        opus/silk/float/noise_shape_analysis_FLP.c
+        opus/silk/float/pitch_analysis_core_FLP.c
+        opus/silk/float/process_gains_FLP.c
+        opus/silk/float/regularize_correlations_FLP.c
+        opus/silk/float/residual_energy_FLP.c
+        opus/silk/float/scale_copy_vector_FLP.c
+        opus/silk/float/scale_vector_FLP.c
+        opus/silk/float/schur_FLP.c
+        opus/silk/float/sort_FLP.c
+        opus/silk/float/warped_autocorrelation_FLP.c
+        opus/silk/float/wrappers_FLP.c
+    )
+endif()
+
+target_compile_definitions(opus PRIVATE OPUS_BUILD ENABLE_HARDENING)
+
+if(NOT MSVC)
+    if(MINGW)
+        target_compile_definitions(opus PRIVATE _FORTIFY_SOURCE=0)
+    else()
+        target_compile_definitions(opus PRIVATE _FORTIFY_SOURCE=2)
+    endif()
+endif()
+
+# It is strongly recommended to uncomment one of these VAR_ARRAYS: Use C99
+# variable-length arrays for stack allocation USE_ALLOCA: Use alloca() for stack
+# allocation If none is defined, then the fallback is a non-threadsafe global
+# array
+if(OPUS_USE_ALLOCA OR MSVC)
+    target_compile_definitions(opus PRIVATE USE_ALLOCA)
+else()
+    target_compile_definitions(opus PRIVATE VAR_ARRAYS)
+endif()
+
+if(OPUS_CUSTOM_MODES)
+    target_compile_definitions(opus PRIVATE CUSTOM_MODES)
+endif()
+
+if(NOT OPUS_ENABLE_FLOAT_API)
+    target_compile_definitions(opus PRIVATE DISABLE_FLOAT_API)
+endif()
+
+target_compile_definitions(opus
+PUBLIC
+    -DOPUS_VERSION="\\"1.3.1\\""
+
+PRIVATE
+    # Use C99 intrinsics to speed up float-to-int conversion
+    HAVE_LRINTF
+)
+
+if (FIXED_POINT)
+    target_compile_definitions(opus PRIVATE -DFIXED_POINT=1 -DDISABLE_FLOAT_API)
+endif()
+
+target_include_directories(opus
+PUBLIC
+    opus/include
+
+PRIVATE
+    opus/celt
+    opus/silk
+    opus/silk/fixed
+    opus/silk/float
+    opus/src
+)
+
+add_library(Opus::opus ALIAS opus)
@@ -1,744 +0,0 @@
-// SPDX-FileCopyrightText: Baldur Karlsson
-// SPDX-License-Identifier: MIT
-
-/******************************************************************************
- * The MIT License (MIT)
- *
- * Copyright (c) 2019-2023 Baldur Karlsson
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- ******************************************************************************/
-
-#pragma once
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Documentation for the API is available at https://renderdoc.org/docs/in_application_api.html
-//
-
-#if !defined(RENDERDOC_NO_STDINT)
-#include <stdint.h>
-#endif
-
-#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
-#define RENDERDOC_CC __cdecl
-#elif defined(__linux__)
-#define RENDERDOC_CC
-#elif defined(__APPLE__)
-#define RENDERDOC_CC
-#else
-#error "Unknown platform"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// Constants not used directly in below API
-
-// This is a GUID/magic value used for when applications pass a path where shader debug
-// information can be found to match up with a stripped shader.
-// the define can be used like so: const GUID RENDERDOC_ShaderDebugMagicValue =
-// RENDERDOC_ShaderDebugMagicValue_value
-#define RENDERDOC_ShaderDebugMagicValue_struct                                \
-  {                                                                           \
-    0xeab25520, 0x6670, 0x4865, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
-  }
-
-// as an alternative when you want a byte array (assuming x86 endianness):
-#define RENDERDOC_ShaderDebugMagicValue_bytearray                                                 \
-  {                                                                                               \
-    0x20, 0x55, 0xb2, 0xea, 0x70, 0x66, 0x65, 0x48, 0x84, 0x29, 0x6c, 0x8, 0x51, 0x54, 0x00, 0xff \
-  }
-
-// truncated version when only a uint64_t is available (e.g. Vulkan tags):
-#define RENDERDOC_ShaderDebugMagicValue_truncated 0x48656670eab25520ULL
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// RenderDoc capture options
-//
-
-typedef enum RENDERDOC_CaptureOption
-{
-  // Allow the application to enable vsync
-  //
-  // Default - enabled
-  //
-  // 1 - The application can enable or disable vsync at will
-  // 0 - vsync is force disabled
-  eRENDERDOC_Option_AllowVSync = 0,
-
-  // Allow the application to enable fullscreen
-  //
-  // Default - enabled
-  //
-  // 1 - The application can enable or disable fullscreen at will
-  // 0 - fullscreen is force disabled
-  eRENDERDOC_Option_AllowFullscreen = 1,
-
-  // Record API debugging events and messages
-  //
-  // Default - disabled
-  //
-  // 1 - Enable built-in API debugging features and records the results into
-  //     the capture, which is matched up with events on replay
-  // 0 - no API debugging is forcibly enabled
-  eRENDERDOC_Option_APIValidation = 2,
-  eRENDERDOC_Option_DebugDeviceMode = 2,    // deprecated name of this enum
-
-  // Capture CPU callstacks for API events
-  //
-  // Default - disabled
-  //
-  // 1 - Enables capturing of callstacks
-  // 0 - no callstacks are captured
-  eRENDERDOC_Option_CaptureCallstacks = 3,
-
-  // When capturing CPU callstacks, only capture them from actions.
-  // This option does nothing without the above option being enabled
-  //
-  // Default - disabled
-  //
-  // 1 - Only captures callstacks for actions.
-  //     Ignored if CaptureCallstacks is disabled
-  // 0 - Callstacks, if enabled, are captured for every event.
-  eRENDERDOC_Option_CaptureCallstacksOnlyDraws = 4,
-  eRENDERDOC_Option_CaptureCallstacksOnlyActions = 4,
-
-  // Specify a delay in seconds to wait for a debugger to attach, after
-  // creating or injecting into a process, before continuing to allow it to run.
-  //
-  // 0 indicates no delay, and the process will run immediately after injection
-  //
-  // Default - 0 seconds
-  //
-  eRENDERDOC_Option_DelayForDebugger = 5,
-
-  // Verify buffer access. This includes checking the memory returned by a Map() call to
-  // detect any out-of-bounds modification, as well as initialising buffers with undefined contents
-  // to a marker value to catch use of uninitialised memory.
-  //
-  // NOTE: This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
-  // not do the same kind of interception & checking and undefined contents are really undefined.
-  //
-  // Default - disabled
-  //
-  // 1 - Verify buffer access
-  // 0 - No verification is performed, and overwriting bounds may cause crashes or corruption in
-  //     RenderDoc.
-  eRENDERDOC_Option_VerifyBufferAccess = 6,
-
-  // The old name for eRENDERDOC_Option_VerifyBufferAccess was eRENDERDOC_Option_VerifyMapWrites.
-  // This option now controls the filling of uninitialised buffers with 0xdddddddd which was
-  // previously always enabled
-  eRENDERDOC_Option_VerifyMapWrites = eRENDERDOC_Option_VerifyBufferAccess,
-
-  // Hooks any system API calls that create child processes, and injects
-  // RenderDoc into them recursively with the same options.
-  //
-  // Default - disabled
-  //
-  // 1 - Hooks into spawned child processes
-  // 0 - Child processes are not hooked by RenderDoc
-  eRENDERDOC_Option_HookIntoChildren = 7,
-
-  // By default RenderDoc only includes resources in the final capture necessary
-  // for that frame, this allows you to override that behaviour.
-  //
-  // Default - disabled
-  //
-  // 1 - all live resources at the time of capture are included in the capture
-  //     and available for inspection
-  // 0 - only the resources referenced by the captured frame are included
-  eRENDERDOC_Option_RefAllResources = 8,
-
-  // **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
-  // getting it will be ignored, to allow compatibility with older versions.
-  // In v1.1 the option acts as if it's always enabled.
-  //
-  // By default RenderDoc skips saving initial states for resources where the
-  // previous contents don't appear to be used, assuming that writes before
-  // reads indicate previous contents aren't used.
-  //
-  // Default - disabled
-  //
-  // 1 - initial contents at the start of each captured frame are saved, even if
-  //     they are later overwritten or cleared before being used.
-  // 0 - unless a read is detected, initial contents will not be saved and will
-  //     appear as black or empty data.
-  eRENDERDOC_Option_SaveAllInitials = 9,
-
-  // In APIs that allow for the recording of command lists to be replayed later,
-  // RenderDoc may choose to not capture command lists before a frame capture is
-  // triggered, to reduce overheads. This means any command lists recorded once
-  // and replayed many times will not be available and may cause a failure to
-  // capture.
-  //
-  // NOTE: This is only true for APIs where multithreading is difficult or
-  // discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
-  // and always capture all command lists since the API is heavily oriented
-  // around it and the overheads have been reduced by API design.
-  //
-  // 1 - All command lists are captured from the start of the application
-  // 0 - Command lists are only captured if their recording begins during
-  //     the period when a frame capture is in progress.
-  eRENDERDOC_Option_CaptureAllCmdLists = 10,
-
-  // Mute API debugging output when the API validation mode option is enabled
-  //
-  // Default - enabled
-  //
-  // 1 - Mute any API debug messages from being displayed or passed through
-  // 0 - API debugging is displayed as normal
-  eRENDERDOC_Option_DebugOutputMute = 11,
-
-  // Option to allow vendor extensions to be used even when they may be
-  // incompatible with RenderDoc and cause corrupted replays or crashes.
-  //
-  // Default - inactive
-  //
-  // No values are documented, this option should only be used when absolutely
-  // necessary as directed by a RenderDoc developer.
-  eRENDERDOC_Option_AllowUnsupportedVendorExtensions = 12,
-
-  // Define a soft memory limit which some APIs may aim to keep overhead under where
-  // possible. Anything above this limit will where possible be saved directly to disk during
-  // capture.
-  // This will cause increased disk space use (which may cause a capture to fail if disk space is
-  // exhausted) as well as slower capture times.
-  //
-  // Not all memory allocations may be deferred like this so it is not a guarantee of a memory
-  // limit.
-  //
-  // Units are in MBs, suggested values would range from 200MB to 1000MB.
-  //
-  // Default - 0 Megabytes
-  eRENDERDOC_Option_SoftMemoryLimit = 13,
-} RENDERDOC_CaptureOption;
-
-// Sets an option that controls how RenderDoc behaves on capture.
-//
-// Returns 1 if the option and value are valid
-// Returns 0 if either is invalid and the option is unchanged
-typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionU32)(RENDERDOC_CaptureOption opt, uint32_t val);
-typedef int(RENDERDOC_CC *pRENDERDOC_SetCaptureOptionF32)(RENDERDOC_CaptureOption opt, float val);
-
-// Gets the current value of an option as a uint32_t
-//
-// If the option is invalid, 0xffffffff is returned
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionU32)(RENDERDOC_CaptureOption opt);
-
-// Gets the current value of an option as a float
-//
-// If the option is invalid, -FLT_MAX is returned
-typedef float(RENDERDOC_CC *pRENDERDOC_GetCaptureOptionF32)(RENDERDOC_CaptureOption opt);
-
-typedef enum RENDERDOC_InputButton
-{
-  // '0' - '9' matches ASCII values
-  eRENDERDOC_Key_0 = 0x30,
-  eRENDERDOC_Key_1 = 0x31,
-  eRENDERDOC_Key_2 = 0x32,
-  eRENDERDOC_Key_3 = 0x33,
-  eRENDERDOC_Key_4 = 0x34,
-  eRENDERDOC_Key_5 = 0x35,
-  eRENDERDOC_Key_6 = 0x36,
-  eRENDERDOC_Key_7 = 0x37,
-  eRENDERDOC_Key_8 = 0x38,
-  eRENDERDOC_Key_9 = 0x39,
-
-  // 'A' - 'Z' matches ASCII values
-  eRENDERDOC_Key_A = 0x41,
-  eRENDERDOC_Key_B = 0x42,
-  eRENDERDOC_Key_C = 0x43,
-  eRENDERDOC_Key_D = 0x44,
-  eRENDERDOC_Key_E = 0x45,
-  eRENDERDOC_Key_F = 0x46,
-  eRENDERDOC_Key_G = 0x47,
-  eRENDERDOC_Key_H = 0x48,
-  eRENDERDOC_Key_I = 0x49,
-  eRENDERDOC_Key_J = 0x4A,
-  eRENDERDOC_Key_K = 0x4B,
-  eRENDERDOC_Key_L = 0x4C,
-  eRENDERDOC_Key_M = 0x4D,
-  eRENDERDOC_Key_N = 0x4E,
-  eRENDERDOC_Key_O = 0x4F,
-  eRENDERDOC_Key_P = 0x50,
-  eRENDERDOC_Key_Q = 0x51,
-  eRENDERDOC_Key_R = 0x52,
-  eRENDERDOC_Key_S = 0x53,
-  eRENDERDOC_Key_T = 0x54,
-  eRENDERDOC_Key_U = 0x55,
-  eRENDERDOC_Key_V = 0x56,
-  eRENDERDOC_Key_W = 0x57,
-  eRENDERDOC_Key_X = 0x58,
-  eRENDERDOC_Key_Y = 0x59,
-  eRENDERDOC_Key_Z = 0x5A,
-
-  // leave the rest of the ASCII range free
-  // in case we want to use it later
-  eRENDERDOC_Key_NonPrintable = 0x100,
-
-  eRENDERDOC_Key_Divide,
-  eRENDERDOC_Key_Multiply,
-  eRENDERDOC_Key_Subtract,
-  eRENDERDOC_Key_Plus,
-
-  eRENDERDOC_Key_F1,
-  eRENDERDOC_Key_F2,
-  eRENDERDOC_Key_F3,
-  eRENDERDOC_Key_F4,
-  eRENDERDOC_Key_F5,
-  eRENDERDOC_Key_F6,
-  eRENDERDOC_Key_F7,
-  eRENDERDOC_Key_F8,
-  eRENDERDOC_Key_F9,
-  eRENDERDOC_Key_F10,
-  eRENDERDOC_Key_F11,
-  eRENDERDOC_Key_F12,
-
-  eRENDERDOC_Key_Home,
-  eRENDERDOC_Key_End,
-  eRENDERDOC_Key_Insert,
-  eRENDERDOC_Key_Delete,
-  eRENDERDOC_Key_PageUp,
-  eRENDERDOC_Key_PageDn,
-
-  eRENDERDOC_Key_Backspace,
-  eRENDERDOC_Key_Tab,
-  eRENDERDOC_Key_PrtScrn,
-  eRENDERDOC_Key_Pause,
-
-  eRENDERDOC_Key_Max,
-} RENDERDOC_InputButton;
-
-// Sets which key or keys can be used to toggle focus between multiple windows
-//
-// If keys is NULL or num is 0, toggle keys will be disabled
-typedef void(RENDERDOC_CC *pRENDERDOC_SetFocusToggleKeys)(RENDERDOC_InputButton *keys, int num);
-
-// Sets which key or keys can be used to capture the next frame
-//
-// If keys is NULL or num is 0, captures keys will be disabled
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureKeys)(RENDERDOC_InputButton *keys, int num);
-
-typedef enum RENDERDOC_OverlayBits
-{
-  // This single bit controls whether the overlay is enabled or disabled globally
-  eRENDERDOC_Overlay_Enabled = 0x1,
-
-  // Show the average framerate over several seconds as well as min/max
-  eRENDERDOC_Overlay_FrameRate = 0x2,
-
-  // Show the current frame number
-  eRENDERDOC_Overlay_FrameNumber = 0x4,
-
-  // Show a list of recent captures, and how many captures have been made
-  eRENDERDOC_Overlay_CaptureList = 0x8,
-
-  // Default values for the overlay mask
-  eRENDERDOC_Overlay_Default = (eRENDERDOC_Overlay_Enabled | eRENDERDOC_Overlay_FrameRate |
-                                eRENDERDOC_Overlay_FrameNumber | eRENDERDOC_Overlay_CaptureList),
-
-  // Enable all bits
-  eRENDERDOC_Overlay_All = ~0U,
-
-  // Disable all bits
-  eRENDERDOC_Overlay_None = 0,
-} RENDERDOC_OverlayBits;
-
-// returns the overlay bits that have been set
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetOverlayBits)();
-// sets the overlay bits with an and & or mask
-typedef void(RENDERDOC_CC *pRENDERDOC_MaskOverlayBits)(uint32_t And, uint32_t Or);
-
-// this function will attempt to remove RenderDoc's hooks in the application.
-//
-// Note: that this can only work correctly if done immediately after
-// the module is loaded, before any API work happens. RenderDoc will remove its
-// injected hooks and shut down. Behaviour is undefined if this is called
-// after any API functions have been called, and there is still no guarantee of
-// success.
-typedef void(RENDERDOC_CC *pRENDERDOC_RemoveHooks)();
-
-// DEPRECATED: compatibility for code compiled against pre-1.4.1 headers.
-typedef pRENDERDOC_RemoveHooks pRENDERDOC_Shutdown;
-
-// This function will unload RenderDoc's crash handler.
-//
-// If you use your own crash handler and don't want RenderDoc's handler to
-// intercede, you can call this function to unload it and any unhandled
-// exceptions will pass to the next handler.
-typedef void(RENDERDOC_CC *pRENDERDOC_UnloadCrashHandler)();
-
-// Sets the capture file path template
-//
-// pathtemplate is a UTF-8 string that gives a template for how captures will be named
-// and where they will be saved.
-//
-// Any extension is stripped off the path, and captures are saved in the directory
-// specified, and named with the filename and the frame number appended. If the
-// directory does not exist it will be created, including any parent directories.
-//
-// If pathtemplate is NULL, the template will remain unchanged
-//
-// Example:
-//
-// SetCaptureFilePathTemplate("my_captures/example");
-//
-// Capture #1 -> my_captures/example_frame123.rdc
-// Capture #2 -> my_captures/example_frame456.rdc
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFilePathTemplate)(const char *pathtemplate);
-
-// returns the current capture path template, see SetCaptureFileTemplate above, as a UTF-8 string
-typedef const char *(RENDERDOC_CC *pRENDERDOC_GetCaptureFilePathTemplate)();
-
-// DEPRECATED: compatibility for code compiled against pre-1.1.2 headers.
-typedef pRENDERDOC_SetCaptureFilePathTemplate pRENDERDOC_SetLogFilePathTemplate;
-typedef pRENDERDOC_GetCaptureFilePathTemplate pRENDERDOC_GetLogFilePathTemplate;
-
-// returns the number of captures that have been made
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetNumCaptures)();
-
-// This function returns the details of a capture, by index. New captures are added
-// to the end of the list.
-//
-// filename will be filled with the absolute path to the capture file, as a UTF-8 string
-// pathlength will be written with the length in bytes of the filename string
-// timestamp will be written with the time of the capture, in seconds since the Unix epoch
-//
-// Any of the parameters can be NULL and they'll be skipped.
-//
-// The function will return 1 if the capture index is valid, or 0 if the index is invalid
-// If the index is invalid, the values will be unchanged
-//
-// Note: when captures are deleted in the UI they will remain in this list, so the
-// capture path may not exist anymore.
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_GetCapture)(uint32_t idx, char *filename,
-                                                      uint32_t *pathlength, uint64_t *timestamp);
-
-// Sets the comments associated with a capture file. These comments are displayed in the
-// UI program when opening.
-//
-// filePath should be a path to the capture file to add comments to. If set to NULL or ""
-// the most recent capture file created made will be used instead.
-// comments should be a NULL-terminated UTF-8 string to add as comments.
-//
-// Any existing comments will be overwritten.
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureFileComments)(const char *filePath,
-                                                              const char *comments);
-
-// returns 1 if the RenderDoc UI is connected to this application, 0 otherwise
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsTargetControlConnected)();
-
-// DEPRECATED: compatibility for code compiled against pre-1.1.1 headers.
-// This was renamed to IsTargetControlConnected in API 1.1.1, the old typedef is kept here for
-// backwards compatibility with old code, it is castable either way since it's ABI compatible
-// as the same function pointer type.
-typedef pRENDERDOC_IsTargetControlConnected pRENDERDOC_IsRemoteAccessConnected;
-
-// This function will launch the Replay UI associated with the RenderDoc library injected
-// into the running application.
-//
-// if connectTargetControl is 1, the Replay UI will be launched with a command line parameter
-// to connect to this application
-// cmdline is the rest of the command line, as a UTF-8 string. E.g. a captures to open
-// if cmdline is NULL, the command line will be empty.
-//
-// returns the PID of the replay UI if successful, 0 if not successful.
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_LaunchReplayUI)(uint32_t connectTargetControl,
-                                                          const char *cmdline);
-
-// RenderDoc can return a higher version than requested if it's backwards compatible,
-// this function returns the actual version returned. If a parameter is NULL, it will be
-// ignored and the others will be filled out.
-typedef void(RENDERDOC_CC *pRENDERDOC_GetAPIVersion)(int *major, int *minor, int *patch);
-
-// Requests that the replay UI show itself (if hidden or not the current top window). This can be
-// used in conjunction with IsTargetControlConnected and LaunchReplayUI to intelligently handle
-// showing the UI after making a capture.
-//
-// This will return 1 if the request was successfully passed on, though it's not guaranteed that
-// the UI will be on top in all cases depending on OS rules. It will return 0 if there is no current
-// target control connection to make such a request, or if there was another error
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_ShowReplayUI)();
-
-//////////////////////////////////////////////////////////////////////////
-// Capturing functions
-//
-
-// A device pointer is a pointer to the API's root handle.
-//
-// This would be an ID3D11Device, HGLRC/GLXContext, ID3D12Device, etc
-typedef void *RENDERDOC_DevicePointer;
-
-// A window handle is the OS's native window handle
-//
-// This would be an HWND, GLXDrawable, etc
-typedef void *RENDERDOC_WindowHandle;
-
-// A helper macro for Vulkan, where the device handle cannot be used directly.
-//
-// Passing the VkInstance to this macro will return the RENDERDOC_DevicePointer to use.
-//
-// Specifically, the value needed is the dispatch table pointer, which sits as the first
-// pointer-sized object in the memory pointed to by the VkInstance. Thus we cast to a void** and
-// indirect once.
-#define RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(inst) (*((void **)(inst)))
-
-// This sets the RenderDoc in-app overlay in the API/window pair as 'active' and it will
-// respond to keypresses. Neither parameter can be NULL
-typedef void(RENDERDOC_CC *pRENDERDOC_SetActiveWindow)(RENDERDOC_DevicePointer device,
-                                                       RENDERDOC_WindowHandle wndHandle);
-
-// capture the next frame on whichever window and API is currently considered active
-typedef void(RENDERDOC_CC *pRENDERDOC_TriggerCapture)();
-
-// capture the next N frames on whichever window and API is currently considered active
-typedef void(RENDERDOC_CC *pRENDERDOC_TriggerMultiFrameCapture)(uint32_t numFrames);
-
-// When choosing either a device pointer or a window handle to capture, you can pass NULL.
-// Passing NULL specifies a 'wildcard' match against anything. This allows you to specify
-// any API rendering to a specific window, or a specific API instance rendering to any window,
-// or in the simplest case of one window and one API, you can just pass NULL for both.
-//
-// In either case, if there are two or more possible matching (device,window) pairs it
-// is undefined which one will be captured.
-//
-// Note: for headless rendering you can pass NULL for the window handle and either specify
-// a device pointer or leave it NULL as above.
-
-// Immediately starts capturing API calls on the specified device pointer and window handle.
-//
-// If there is no matching thing to capture (e.g. no supported API has been initialised),
-// this will do nothing.
-//
-// The results are undefined (including crashes) if two captures are started overlapping,
-// even on separate devices and/oror windows.
-typedef void(RENDERDOC_CC *pRENDERDOC_StartFrameCapture)(RENDERDOC_DevicePointer device,
-                                                         RENDERDOC_WindowHandle wndHandle);
-
-// Returns whether or not a frame capture is currently ongoing anywhere.
-//
-// This will return 1 if a capture is ongoing, and 0 if there is no capture running
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_IsFrameCapturing)();
-
-// Ends capturing immediately.
-//
-// This will return 1 if the capture succeeded, and 0 if there was an error capturing.
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_EndFrameCapture)(RENDERDOC_DevicePointer device,
-                                                           RENDERDOC_WindowHandle wndHandle);
-
-// Ends capturing immediately and discard any data stored without saving to disk.
-//
-// This will return 1 if the capture was discarded, and 0 if there was an error or no capture
-// was in progress
-typedef uint32_t(RENDERDOC_CC *pRENDERDOC_DiscardFrameCapture)(RENDERDOC_DevicePointer device,
-                                                               RENDERDOC_WindowHandle wndHandle);
-
-// Only valid to be called between a call to StartFrameCapture and EndFrameCapture. Gives a custom
-// title to the capture produced which will be displayed in the UI.
-//
-// If multiple captures are ongoing, this title will be applied to the first capture to end after
-// this call. The second capture to end will have no title, unless this function is called again.
-//
-// Calling this function has no effect if no capture is currently running, and if it is called
-// multiple times only the last title will be used.
-typedef void(RENDERDOC_CC *pRENDERDOC_SetCaptureTitle)(const char *title);
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// RenderDoc API versions
-//
-
-// RenderDoc uses semantic versioning (http://semver.org/).
-//
-// MAJOR version is incremented when incompatible API changes happen.
-// MINOR version is incremented when functionality is added in a backwards-compatible manner.
-// PATCH version is incremented when backwards-compatible bug fixes happen.
-//
-// Note that this means the API returned can be higher than the one you might have requested.
-// e.g. if you are running against a newer RenderDoc that supports 1.0.1, it will be returned
-// instead of 1.0.0. You can check this with the GetAPIVersion entry point
-typedef enum RENDERDOC_Version
-{
-  eRENDERDOC_API_Version_1_0_0 = 10000,    // RENDERDOC_API_1_0_0 = 1 00 00
-  eRENDERDOC_API_Version_1_0_1 = 10001,    // RENDERDOC_API_1_0_1 = 1 00 01
-  eRENDERDOC_API_Version_1_0_2 = 10002,    // RENDERDOC_API_1_0_2 = 1 00 02
-  eRENDERDOC_API_Version_1_1_0 = 10100,    // RENDERDOC_API_1_1_0 = 1 01 00
-  eRENDERDOC_API_Version_1_1_1 = 10101,    // RENDERDOC_API_1_1_1 = 1 01 01
-  eRENDERDOC_API_Version_1_1_2 = 10102,    // RENDERDOC_API_1_1_2 = 1 01 02
-  eRENDERDOC_API_Version_1_2_0 = 10200,    // RENDERDOC_API_1_2_0 = 1 02 00
-  eRENDERDOC_API_Version_1_3_0 = 10300,    // RENDERDOC_API_1_3_0 = 1 03 00
-  eRENDERDOC_API_Version_1_4_0 = 10400,    // RENDERDOC_API_1_4_0 = 1 04 00
-  eRENDERDOC_API_Version_1_4_1 = 10401,    // RENDERDOC_API_1_4_1 = 1 04 01
-  eRENDERDOC_API_Version_1_4_2 = 10402,    // RENDERDOC_API_1_4_2 = 1 04 02
-  eRENDERDOC_API_Version_1_5_0 = 10500,    // RENDERDOC_API_1_5_0 = 1 05 00
-  eRENDERDOC_API_Version_1_6_0 = 10600,    // RENDERDOC_API_1_6_0 = 1 06 00
-} RENDERDOC_Version;
-
-// API version changelog:
-//
-// 1.0.0 - initial release
-// 1.0.1 - Bugfix: IsFrameCapturing() was returning false for captures that were triggered
-//         by keypress or TriggerCapture, instead of Start/EndFrameCapture.
-// 1.0.2 - Refactor: Renamed eRENDERDOC_Option_DebugDeviceMode to eRENDERDOC_Option_APIValidation
-// 1.1.0 - Add feature: TriggerMultiFrameCapture(). Backwards compatible with 1.0.x since the new
-//         function pointer is added to the end of the struct, the original layout is identical
-// 1.1.1 - Refactor: Renamed remote access to target control (to better disambiguate from remote
-//         replay/remote server concept in replay UI)
-// 1.1.2 - Refactor: Renamed "log file" in function names to just capture, to clarify that these
-//         are captures and not debug logging files. This is the first API version in the v1.0
-//         branch.
-// 1.2.0 - Added feature: SetCaptureFileComments() to add comments to a capture file that will be
-//         displayed in the UI program on load.
-// 1.3.0 - Added feature: New capture option eRENDERDOC_Option_AllowUnsupportedVendorExtensions
-//         which allows users to opt-in to allowing unsupported vendor extensions to function.
-//         Should be used at the user's own risk.
-//         Refactor: Renamed eRENDERDOC_Option_VerifyMapWrites to
-//         eRENDERDOC_Option_VerifyBufferAccess, which now also controls initialisation to
-//         0xdddddddd of uninitialised buffer contents.
-// 1.4.0 - Added feature: DiscardFrameCapture() to discard a frame capture in progress and stop
-//         capturing without saving anything to disk.
-// 1.4.1 - Refactor: Renamed Shutdown to RemoveHooks to better clarify what is happening
-// 1.4.2 - Refactor: Renamed 'draws' to 'actions' in callstack capture option.
-// 1.5.0 - Added feature: ShowReplayUI() to request that the replay UI show itself if connected
-// 1.6.0 - Added feature: SetCaptureTitle() which can be used to set a title for a
-//         capture made with StartFrameCapture() or EndFrameCapture()
-
-typedef struct RENDERDOC_API_1_6_0
-{
-  pRENDERDOC_GetAPIVersion GetAPIVersion;
-
-  pRENDERDOC_SetCaptureOptionU32 SetCaptureOptionU32;
-  pRENDERDOC_SetCaptureOptionF32 SetCaptureOptionF32;
-
-  pRENDERDOC_GetCaptureOptionU32 GetCaptureOptionU32;
-  pRENDERDOC_GetCaptureOptionF32 GetCaptureOptionF32;
-
-  pRENDERDOC_SetFocusToggleKeys SetFocusToggleKeys;
-  pRENDERDOC_SetCaptureKeys SetCaptureKeys;
-
-  pRENDERDOC_GetOverlayBits GetOverlayBits;
-  pRENDERDOC_MaskOverlayBits MaskOverlayBits;
-
-  // Shutdown was renamed to RemoveHooks in 1.4.1.
-  // These unions allow old code to continue compiling without changes
-  union
-  {
-    pRENDERDOC_Shutdown Shutdown;
-    pRENDERDOC_RemoveHooks RemoveHooks;
-  };
-  pRENDERDOC_UnloadCrashHandler UnloadCrashHandler;
-
-  // Get/SetLogFilePathTemplate was renamed to Get/SetCaptureFilePathTemplate in 1.1.2.
-  // These unions allow old code to continue compiling without changes
-  union
-  {
-    // deprecated name
-    pRENDERDOC_SetLogFilePathTemplate SetLogFilePathTemplate;
-    // current name
-    pRENDERDOC_SetCaptureFilePathTemplate SetCaptureFilePathTemplate;
-  };
-  union
-  {
-    // deprecated name
-    pRENDERDOC_GetLogFilePathTemplate GetLogFilePathTemplate;
-    // current name
-    pRENDERDOC_GetCaptureFilePathTemplate GetCaptureFilePathTemplate;
-  };
-
-  pRENDERDOC_GetNumCaptures GetNumCaptures;
-  pRENDERDOC_GetCapture GetCapture;
-
-  pRENDERDOC_TriggerCapture TriggerCapture;
-
-  // IsRemoteAccessConnected was renamed to IsTargetControlConnected in 1.1.1.
-  // This union allows old code to continue compiling without changes
-  union
-  {
-    // deprecated name
-    pRENDERDOC_IsRemoteAccessConnected IsRemoteAccessConnected;
-    // current name
-    pRENDERDOC_IsTargetControlConnected IsTargetControlConnected;
-  };
-  pRENDERDOC_LaunchReplayUI LaunchReplayUI;
-
-  pRENDERDOC_SetActiveWindow SetActiveWindow;
-
-  pRENDERDOC_StartFrameCapture StartFrameCapture;
-  pRENDERDOC_IsFrameCapturing IsFrameCapturing;
-  pRENDERDOC_EndFrameCapture EndFrameCapture;
-
-  // new function in 1.1.0
-  pRENDERDOC_TriggerMultiFrameCapture TriggerMultiFrameCapture;
-
-  // new function in 1.2.0
-  pRENDERDOC_SetCaptureFileComments SetCaptureFileComments;
-
-  // new function in 1.4.0
-  pRENDERDOC_DiscardFrameCapture DiscardFrameCapture;
-
-  // new function in 1.5.0
-  pRENDERDOC_ShowReplayUI ShowReplayUI;
-
-  // new function in 1.6.0
-  pRENDERDOC_SetCaptureTitle SetCaptureTitle;
-} RENDERDOC_API_1_6_0;
-
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_1;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_0_2;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_1;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_1_2;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_2_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_3_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_0;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_1;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_4_2;
-typedef RENDERDOC_API_1_6_0 RENDERDOC_API_1_5_0;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-// RenderDoc API entry point
-//
-// This entry point can be obtained via GetProcAddress/dlsym if RenderDoc is available.
-//
-// The name is the same as the typedef - "RENDERDOC_GetAPI"
-//
-// This function is not thread safe, and should not be called on multiple threads at once.
-// Ideally, call this once as early as possible in your application's startup, before doing
-// any API work, since some configuration functionality etc has to be done also before
-// initialising any APIs.
-//
-// Parameters:
-//   version is a single value from the RENDERDOC_Version above.
-//
-//   outAPIPointers will be filled out with a pointer to the corresponding struct of function
-//   pointers.
-//
-// Returns:
-//   1 - if the outAPIPointers has been filled with a pointer to the API struct requested
-//   0 - if the requested version is not supported or the arguments are invalid.
-//
-typedef int(RENDERDOC_CC *pRENDERDOC_GetAPI)(RENDERDOC_Version version, void **outAPIPointers);
-
-#ifdef __cplusplus
-}    // extern "C"
-#endif
@@ -24,7 +24,7 @@ if (MSVC)
    # Ensure that projects build with Unicode support.
    add_definitions(-DUNICODE -D_UNICODE)

-    # /W4                 - Level 4 warnings
+    # /W3                 - Level 3 warnings
    # /MP                 - Multi-threaded compilation
    # /Zi                 - Output debugging information
    # /Zm                 - Specifies the precompiled header memory allocation limit
@@ -35,7 +35,6 @@ if (MSVC)
    # /volatile:iso       - Use strict standards-compliant volatile semantics.
    # /Zc:externConstexpr - Allow extern constexpr variables to have external linkage, like the standard mandates
    # /Zc:inline          - Let codegen omit inline functions in object files
-    # /Zc:preprocessor    - Enable standards-conforming preprocessor
    # /Zc:throwingNew     - Let codegen assume `operator new` (without std::nothrow) will never return null
    # /GT                 - Supports fiber safety for data allocated using static thread-local storage
    add_compile_options(
@@ -49,7 +48,6 @@ if (MSVC)
        /volatile:iso
        /Zc:externConstexpr
        /Zc:inline
-        /Zc:preprocessor
        /Zc:throwingNew
        /GT

@@ -61,7 +59,7 @@ if (MSVC)
        /external:W0            # Sets the default warning level to 0 for external headers, effectively turning off warnings for external headers

        # Warnings
-        /W4
+        /W3
        /WX

        /we4062 # Enumerator 'identifier' in a switch of enum 'enumeration' is not handled
@@ -84,17 +82,12 @@ if (MSVC)

        /wd4100 # 'identifier': unreferenced formal parameter
        /wd4324 # 'struct_name': structure was padded due to __declspec(align())
-        /wd4201 # nonstandard extension used : nameless struct/union
-        /wd4702 # unreachable code (when used with LTO)
    )

    if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS)
    # when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format
    # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21
        add_compile_options(/Z7)
-        # Avoid D9025 warning
-        string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-        string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
    else()
        add_compile_options(/Zi)
    endif()
@@ -110,8 +103,6 @@ if (MSVC)
    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
 else()
    add_compile_options(
-        -fwrapv
-
        -Werror=all
        -Werror=extra
        -Werror=missing-declarations
@@ -121,21 +112,19 @@ else()
        -Wno-attributes
        -Wno-invalid-offsetof
        -Wno-unused-parameter
-    )

-    if (CMAKE_CXX_COMPILER_ID MATCHES Clang) # Clang or AppleClang
-        add_compile_options(
-            -Wno-braced-scalar-init
-            -Wno-unused-private-field
-            -Wno-nullability-completeness
-            -Werror=shadow-uncaptured-local
-            -Werror=implicit-fallthrough
-            -Werror=type-limits
-        )
-    endif()
+        $<$<CXX_COMPILER_ID:Clang>:-Wno-braced-scalar-init>
+        $<$<CXX_COMPILER_ID:Clang>:-Wno-unused-private-field>
+        $<$<CXX_COMPILER_ID:Clang>:-Werror=shadow-uncaptured-local>
+        $<$<CXX_COMPILER_ID:Clang>:-Werror=implicit-fallthrough>
+        $<$<CXX_COMPILER_ID:Clang>:-Werror=type-limits>
+        $<$<CXX_COMPILER_ID:AppleClang>:-Wno-braced-scalar-init>
+        $<$<CXX_COMPILER_ID:AppleClang>:-Wno-unused-private-field>
+    )

    if (ARCHITECTURE_x86_64)
        add_compile_options("-mcx16")
+        add_compile_options("-fwrapv")
    endif()

    if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
@@ -143,7 +132,7 @@ else()
    endif()

    # GCC bugs
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
        # These diagnostics would be great if they worked, but are just completely broken
        # and produce bogus errors on external libraries like fmt.
        add_compile_options(
@@ -63,6 +63,3 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
-
-# Autogenerated library for vulkan validation layers
-libVkLayer_khronos_validation.so
@@ -27,7 +27,7 @@ android {
    namespace = "org.yuzu.yuzu_emu"

    compileSdkVersion = "android-34"
-    ndkVersion = "26.1.10909125"
+    ndkVersion = "25.2.9519653"

    buildFeatures {
        viewBinding = true
@@ -47,10 +47,6 @@ android {
        jniLibs.useLegacyPackaging = true
    }

-    androidResources {
-        generateLocaleConfig = true
-    }
-
    defaultConfig {
        // TODO If this is ever modified, change application_id in strings.xml
        applicationId = "org.yuzu.yuzu_emu"
@@ -81,30 +77,13 @@ android {
        buildConfigField("String", "BRANCH", "\"${getBranch()}\"")
    }

-    val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
-    if (keystoreFile != null) {
-        signingConfigs {
-            create("release") {
-                storeFile = file(keystoreFile)
-                storePassword = System.getenv("ANDROID_KEYSTORE_PASS")
-                keyAlias = System.getenv("ANDROID_KEY_ALIAS")
-                keyPassword = System.getenv("ANDROID_KEYSTORE_PASS")
-            }
-        }
-    }
-
    // Define build types, which are orthogonal to product flavors.
    buildTypes {

        // Signed by release key, allowing for upload to Play Store.
        release {
-            signingConfig = if (keystoreFile != null) {
-                signingConfigs.getByName("release")
-            } else {
-                signingConfigs.getByName("debug")
-            }
-
            resValue("string", "app_name_suffixed", "yuzu")
+            signingConfig = signingConfigs.getByName("debug")
            isMinifyEnabled = true
            isDebuggable = false
            proguardFiles(
@@ -116,7 +95,6 @@ android {
        // builds a release build that doesn't need signing
        // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
        register("relWithDebInfo") {
-            isDefault = true
            resValue("string", "app_name_suffixed", "yuzu Debug Release")
            signingConfig = signingConfigs.getByName("debug")
            isMinifyEnabled = true
@@ -144,7 +122,6 @@ android {
    flavorDimensions.add("version")
    productFlavors {
        create("mainline") {
-            isDefault = true
            dimension = "version"
            buildConfigField("Boolean", "PREMIUM", "false")
        }
@@ -183,11 +160,6 @@ android {
    }
 }

-tasks.create<Delete>("ktlintReset") {
-    delete(File(buildDir.path + File.separator + "intermediates/ktLint"))
-}
-
-tasks.getByPath("loadKtlintReporters").dependsOn("ktlintReset")
 tasks.getByPath("preBuild").dependsOn("ktlintCheck")

 ktlint {
@@ -207,23 +179,23 @@ ktlint {
 }

 dependencies {
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.core:core-ktx:1.10.1")
    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
+    implementation("androidx.recyclerview:recyclerview:1.3.0")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.fragment:fragment-ktx:1.6.1")
+    implementation("androidx.fragment:fragment-ktx:1.6.0")
    implementation("androidx.documentfile:documentfile:1.0.1")
    implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
+    implementation("androidx.preference:preference:1.2.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
    implementation("io.coil-kt:coil:2.2.2")
    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.window:window:1.2.0-beta03")
+    implementation("androidx.window:window:1.1.0")
    implementation("org.ini4j:ini4j:0.5.4")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.4")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
+    implementation("androidx.navigation:navigation-ui-ktx:2.6.0")
    implementation("info.debatty:java-string-similarity:2.0.0")
    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 }
@@ -25,8 +25,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
        android:hasFragileUserData="false"
        android:supportsRtl="true"
        android:isGame="true"
-        android:appCategory="game"
+        android:localeConfig="@xml/locales_config"
        android:banner="@drawable/tv_banner"
+        android:extractNativeLibs="true"
        android:fullBackupContent="@xml/data_extraction_rules"
        android:dataExtractionRules="@xml/data_extraction_rules_api_31"
        android:enableOnBackInvokedCallback="true">
@@ -54,6 +55,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
            android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
            android:theme="@style/Theme.Yuzu.Main"
            android:launchMode="singleTop"
+            android:screenOrientation="userLandscape"
            android:supportsPictureInPicture="true"
            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
            android:exported="true">
@@ -64,14 +66,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                <data android:mimeType="application/octet-stream" />
            </intent-filter>

-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data
-                    android:mimeType="application/octet-stream"
-                    android:scheme="content"/>
-            </intent-filter>
-
            <meta-data
                android:name="android.nfc.action.TECH_DISCOVERED"
                android:resource="@xml/nfc_tech_filter" />
@@ -5,7 +5,6 @@ package org.yuzu.yuzu_emu

 import android.app.Dialog
 import android.content.DialogInterface
-import android.net.Uri
 import android.os.Bundle
 import android.text.Html
 import android.text.method.LinkMovementMethod
@@ -16,10 +15,16 @@ import androidx.annotation.Keep
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.lang.ref.WeakReference
+import org.yuzu.yuzu_emu.YuzuApplication.Companion.appContext
 import org.yuzu.yuzu_emu.activities.EmulationActivity
-import org.yuzu.yuzu_emu.utils.DocumentsTree
-import org.yuzu.yuzu_emu.utils.FileUtil
-import org.yuzu.yuzu_emu.utils.Log
+import org.yuzu.yuzu_emu.utils.DocumentsTree.Companion.isNativePath
+import org.yuzu.yuzu_emu.utils.FileUtil.exists
+import org.yuzu.yuzu_emu.utils.FileUtil.getFileSize
+import org.yuzu.yuzu_emu.utils.FileUtil.isDirectory
+import org.yuzu.yuzu_emu.utils.FileUtil.openContentUri
+import org.yuzu.yuzu_emu.utils.Log.error
+import org.yuzu.yuzu_emu.utils.Log.verbose
+import org.yuzu.yuzu_emu.utils.Log.warning
 import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable

 /**
@@ -69,61 +74,43 @@ object NativeLibrary {
    @Keep
    @JvmStatic
    fun openContentUri(path: String?, openmode: String?): Int {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.openContentUri(path, openmode)
        } else {
-            FileUtil.openContentUri(path, openmode)
+            openContentUri(appContext, path, openmode)
        }
    }

    @Keep
    @JvmStatic
    fun getSize(path: String?): Long {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.getFileSize(path)
        } else {
-            FileUtil.getFileSize(path)
+            getFileSize(appContext, path)
        }
    }

    @Keep
    @JvmStatic
    fun exists(path: String?): Boolean {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.exists(path)
        } else {
-            FileUtil.exists(path, suppressLog = true)
+            exists(appContext, path)
        }
    }

    @Keep
    @JvmStatic
    fun isDirectory(path: String?): Boolean {
-        return if (DocumentsTree.isNativePath(path!!)) {
+        return if (isNativePath(path!!)) {
            YuzuApplication.documentsTree!!.isDirectory(path)
        } else {
-            FileUtil.isDirectory(path)
+            isDirectory(appContext, path)
        }
    }

-    @Keep
-    @JvmStatic
-    fun getParentDirectory(path: String): String =
-        if (DocumentsTree.isNativePath(path)) {
-            YuzuApplication.documentsTree!!.getParentDirectory(path)
-        } else {
-            path
-        }
-
-    @Keep
-    @JvmStatic
-    fun getFilename(path: String): String =
-        if (DocumentsTree.isNativePath(path)) {
-            YuzuApplication.documentsTree!!.getFilename(path)
-        } else {
-            FileUtil.getFilename(Uri.parse(path))
-        }
-
    /**
     * Returns true if pro controller isn't available and handheld is
     */
@@ -232,16 +219,41 @@ object NativeLibrary {

    external fun reloadSettings()

+    external fun getUserSetting(gameID: String?, Section: String?, Key: String?): String?
+
+    external fun setUserSetting(gameID: String?, Section: String?, Key: String?, Value: String?)
+
    external fun initGameIni(gameID: String?)

+    /**
+     * Gets the embedded icon within the given ROM.
+     *
+     * @param filename the file path to the ROM.
+     * @return a byte array containing the JPEG data for the icon.
+     */
+    external fun getIcon(filename: String): ByteArray
+
+    /**
+     * Gets the embedded title of the given ISO/ROM.
+     *
+     * @param filename The file path to the ISO/ROM.
+     * @return the embedded title of the ISO/ROM.
+     */
+    external fun getTitle(filename: String): String
+
+    external fun getDescription(filename: String): String
+
+    external fun getGameId(filename: String): String
+
+    external fun getRegions(filename: String): String
+
+    external fun getCompany(filename: String): String
+
+    external fun isHomebrew(filename: String): Boolean
+
    external fun setAppDirectory(directory: String)

-    /**
-     * Installs a nsp or xci file to nand
-     * @param filename String representation of file uri
-     * @param extension Lowercase string representation of file extension without "."
-     */
-    external fun installFileToNand(filename: String, extension: String): Int
+    external fun installFileToNand(filename: String): Int

    external fun initializeGpuDriver(
        hookLibDir: String?,
@@ -252,7 +264,7 @@ object NativeLibrary {

    external fun reloadKeys(): Boolean

-    external fun initializeSystem()
+    external fun initializeEmulation()

    external fun defaultCPUCore(): Int

@@ -286,6 +298,11 @@ object NativeLibrary {
     */
    external fun stopEmulation()

+    /**
+     * Resets the in-memory ROM metadata cache.
+     */
+    external fun resetRomMetadata()
+
    /**
     * Returns true if emulation is running (or is paused).
     */
@@ -296,6 +313,21 @@ object NativeLibrary {
     */
    external fun isPaused(): Boolean

+    /**
+     * Mutes emulation sound
+     */
+    external fun muteAudio(): Boolean
+
+    /**
+     * Unmutes emulation sound
+     */
+    external fun unmuteAudio(): Boolean
+
+    /**
+     * Returns true if emulation audio is muted.
+     */
+    external fun isMuted(): Boolean
+
    /**
     * Returns the performance stats for the current game
     */
@@ -381,17 +413,14 @@ object NativeLibrary {
                    details.ifEmpty { emulationActivity.getString(R.string.system_archive_general) }
                )
            }
-
            CoreError.ErrorSavestate -> {
                title = emulationActivity.getString(R.string.save_load_error)
                message = details
            }
-
            CoreError.ErrorUnknown -> {
                title = emulationActivity.getString(R.string.fatal_error)
                message = emulationActivity.getString(R.string.fatal_error_message)
            }
-
            else -> {
                return true
            }
@@ -425,7 +454,6 @@ object NativeLibrary {
                captionId = R.string.loader_error_video_core
                descriptionId = R.string.loader_error_video_core_description
            }
-
            else -> {
                captionId = R.string.loader_error_encrypted
                descriptionId = R.string.loader_error_encrypted_roms_description
@@ -437,7 +465,7 @@ object NativeLibrary {

        val emulationActivity = sEmulationActivity.get()
        if (emulationActivity == null) {
-            Log.warning("[NativeLibrary] EmulationActivity is null, can't exit.")
+            warning("[NativeLibrary] EmulationActivity is null, can't exit.")
            return
        }

@@ -462,27 +490,15 @@ object NativeLibrary {
    }

    fun setEmulationActivity(emulationActivity: EmulationActivity?) {
-        Log.debug("[NativeLibrary] Registering EmulationActivity.")
+        verbose("[NativeLibrary] Registering EmulationActivity.")
        sEmulationActivity = WeakReference(emulationActivity)
    }

    fun clearEmulationActivity() {
-        Log.debug("[NativeLibrary] Unregistering EmulationActivity.")
+        verbose("[NativeLibrary] Unregistering EmulationActivity.")
        sEmulationActivity.clear()
    }

-    @Keep
-    @JvmStatic
-    fun onEmulationStarted() {
-        sEmulationActivity.get()!!.onEmulationStarted()
-    }
-
-    @Keep
-    @JvmStatic
-    fun onEmulationStopped(status: Int) {
-        sEmulationActivity.get()!!.onEmulationStopped(status)
-    }
-
    /**
     * Logs the Yuzu version, Android version and, CPU.
     */
@@ -500,41 +516,6 @@ object NativeLibrary {
     */
    external fun submitInlineKeyboardInput(key_code: Int)

-    /**
-     * Creates a generic user directory if it doesn't exist already
-     */
-    external fun initializeEmptyUserDirectory()
-
-    /**
-     * Gets the launch path for a given applet. It is the caller's responsibility to also
-     * set the system's current applet ID before trying to launch the nca given by this function.
-     *
-     * @param id The applet entry ID
-     * @return The applet's launch path
-     */
-    external fun getAppletLaunchPath(id: Long): String
-
-    /**
-     * Sets the system's current applet ID before launching.
-     *
-     * @param appletId One of the ids in the Service::AM::Applets::AppletId enum
-     */
-    external fun setCurrentAppletId(appletId: Int)
-
-    /**
-     * Sets the cabinet mode for launching the cabinet applet.
-     *
-     * @param cabinetMode One of the modes that corresponds to the enum in Service::NFP::CabinetMode
-     */
-    external fun setCabinetMode(cabinetMode: Int)
-
-    /**
-     * Checks whether NAND contents are available and valid.
-     *
-     * @return 'true' if firmware is available
-     */
-    external fun isFirmwareAvailable(): Boolean
-
    /**
     * Button type for use in onTouchEvent
     */
@@ -46,8 +46,8 @@ class YuzuApplication : Application() {
        super.onCreate()
        application = this
        documentsTree = DocumentsTree()
-        DirectoryInitialization.start()
-        GpuDriverHelper.initializeDriverParameters()
+        DirectoryInitialization.start(applicationContext)
+        GpuDriverHelper.initializeDriverParameters(applicationContext)
        NativeLibrary.logDeviceInfo()

        createNotificationChannels()
@@ -3,7 +3,6 @@

 package org.yuzu.yuzu_emu.activities

-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.PendingIntent
 import android.app.PictureInPictureParams
@@ -43,11 +42,11 @@ import org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
-import org.yuzu.yuzu_emu.model.EmulationViewModel
+import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel
 import org.yuzu.yuzu_emu.model.Game
+import org.yuzu.yuzu_emu.utils.ControllerMappingHelper
 import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
-import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.MemoryUtil
 import org.yuzu.yuzu_emu.utils.NfcReader
 import org.yuzu.yuzu_emu.utils.ThemeHelper
@@ -57,33 +56,34 @@ import kotlin.math.roundToInt
 class EmulationActivity : AppCompatActivity(), SensorEventListener {
    private lateinit var binding: ActivityEmulationBinding

+    private var controllerMappingHelper: ControllerMappingHelper? = null
+
    var isActivityRecreated = false
    private lateinit var nfcReader: NfcReader
+    private lateinit var inputHandler: InputHandler

    private val gyro = FloatArray(3)
    private val accel = FloatArray(3)
    private var motionTimestamp: Long = 0
    private var flipMotionOrientation: Boolean = false

-    private var controllerIds = InputHandler.getGameControllerIds()
-
    private val actionPause = "ACTION_EMULATOR_PAUSE"
    private val actionPlay = "ACTION_EMULATOR_PLAY"
    private val actionMute = "ACTION_EMULATOR_MUTE"
    private val actionUnmute = "ACTION_EMULATOR_UNMUTE"

-    private val emulationViewModel: EmulationViewModel by viewModels()
+    private val settingsViewModel: SettingsViewModel by viewModels()

    override fun onDestroy() {
        stopForegroundService(this)
-        emulationViewModel.clear()
        super.onDestroy()
    }

    override fun onCreate(savedInstanceState: Bundle?) {
-        Log.gameLaunched = true
        ThemeHelper.setTheme(this)

+        settingsViewModel.settings.loadSettings()
+
        super.onCreate(savedInstanceState)

        binding = ActivityEmulationBinding.inflate(layoutInflater)
@@ -91,10 +91,14 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {

        val navHostFragment =
            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
-        navHostFragment.navController.setGraph(R.navigation.emulation_navigation, intent.extras)
+        val navController = navHostFragment.navController
+        navController
+            .setGraph(R.navigation.emulation_navigation, intent.extras)

        isActivityRecreated = savedInstanceState != null

+        controllerMappingHelper = ControllerMappingHelper()
+
        // Set these options now so that the SurfaceView the game renders into is the right size.
        enableFullscreenImmersive()

@@ -103,7 +107,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
        nfcReader = NfcReader(this)
        nfcReader.initialize()

-        InputHandler.initialize()
+        inputHandler = InputHandler()
+        inputHandler.initialize()

        val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
        if (!preferences.getBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, false)) {
@@ -159,7 +164,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
        super.onResume()
        nfcReader.startScanning()
        startMotionSensorListener()
-        InputHandler.updateControllerIds()

        buildPictureInPictureParams()
    }
@@ -193,7 +197,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            return super.dispatchKeyEvent(event)
        }

-        return InputHandler.dispatchKeyEvent(event)
+        return inputHandler.dispatchKeyEvent(event)
    }

    override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
@@ -208,7 +212,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            return true
        }

-        return InputHandler.dispatchGenericMotionEvent(event)
+        return inputHandler.dispatchGenericMotionEvent(event)
    }

    override fun onSensorChanged(event: SensorEvent) {
@@ -331,7 +335,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            pictureInPictureActions.add(pauseRemoteAction)
        }

-        if (BooleanSetting.AUDIO_MUTED.boolean) {
+        if (NativeLibrary.isMuted()) {
            val unmuteIcon = Icon.createWithResource(
                this@EmulationActivity,
                R.drawable.ic_pip_unmute
@@ -388,15 +392,14 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
                if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
            }
            if (intent.action == actionUnmute) {
-                if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
+                if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
            } else if (intent.action == actionMute) {
-                if (!BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(true)
+                if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()
            }
            buildPictureInPictureParams()
        }
    }

-    @SuppressLint("UnspecifiedRegisterReceiverFlag")
    override fun onPictureInPictureModeChanged(
        isInPictureInPictureMode: Boolean,
        newConfig: Configuration
@@ -409,11 +412,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
                addAction(actionMute)
                addAction(actionUnmute)
            }.also {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    registerReceiver(pictureInPictureReceiver, it, RECEIVER_EXPORTED)
-                } else {
-                    registerReceiver(pictureInPictureReceiver, it)
-                }
+                registerReceiver(pictureInPictureReceiver, it)
            }
        } else {
            try {
@@ -421,17 +420,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
            } catch (ignored: Exception) {
            }
            // Always resume audio, since there is no UI button
-            if (BooleanSetting.AUDIO_MUTED.boolean) BooleanSetting.AUDIO_MUTED.setBoolean(false)
-        }
-    }
-
-    fun onEmulationStarted() {
-        emulationViewModel.setEmulationStarted(true)
-    }
-
-    fun onEmulationStopped(status: Int) {
-        if (status == 0) {
-            finish()
+            if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
        }
    }

@@ -1,90 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.FragmentActivity
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.databinding.CardAppletOptionBinding
-import org.yuzu.yuzu_emu.model.Applet
-import org.yuzu.yuzu_emu.model.AppletInfo
-import org.yuzu.yuzu_emu.model.Game
-
-class AppletAdapter(val activity: FragmentActivity, var applets: List<Applet>) :
-    RecyclerView.Adapter<AppletAdapter.AppletViewHolder>(),
-    View.OnClickListener {
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): AppletAdapter.AppletViewHolder {
-        CardAppletOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            .apply { root.setOnClickListener(this@AppletAdapter) }
-            .also { return AppletViewHolder(it) }
-    }
-
-    override fun onBindViewHolder(holder: AppletViewHolder, position: Int) =
-        holder.bind(applets[position])
-
-    override fun getItemCount(): Int = applets.size
-
-    override fun onClick(view: View) {
-        val applet = (view.tag as AppletViewHolder).applet
-        val appletPath = NativeLibrary.getAppletLaunchPath(applet.appletInfo.entryId)
-        if (appletPath.isEmpty()) {
-            Toast.makeText(
-                YuzuApplication.appContext,
-                R.string.applets_error_applet,
-                Toast.LENGTH_SHORT
-            ).show()
-            return
-        }
-
-        if (applet.appletInfo == AppletInfo.Cabinet) {
-            view.findNavController()
-                .navigate(R.id.action_appletLauncherFragment_to_cabinetLauncherDialogFragment)
-            return
-        }
-
-        NativeLibrary.setCurrentAppletId(applet.appletInfo.appletId)
-        val appletGame = Game(
-            title = YuzuApplication.appContext.getString(applet.titleId),
-            path = appletPath
-        )
-        val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-        view.findNavController().navigate(action)
-    }
-
-    inner class AppletViewHolder(val binding: CardAppletOptionBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var applet: Applet
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(applet: Applet) {
-            this.applet = applet
-
-            binding.title.setText(applet.titleId)
-            binding.description.setText(applet.descriptionId)
-            binding.icon.setImageDrawable(
-                ResourcesCompat.getDrawable(
-                    binding.icon.context.resources,
-                    applet.iconId,
-                    binding.icon.context.theme
-                )
-            )
-        }
-    }
-}
@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.HomeNavigationDirections
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.databinding.DialogListItemBinding
-import org.yuzu.yuzu_emu.model.CabinetMode
-import org.yuzu.yuzu_emu.adapters.CabinetLauncherDialogAdapter.CabinetModeViewHolder
-import org.yuzu.yuzu_emu.model.AppletInfo
-import org.yuzu.yuzu_emu.model.Game
-
-class CabinetLauncherDialogAdapter(val fragment: Fragment) :
-    RecyclerView.Adapter<CabinetModeViewHolder>(),
-    View.OnClickListener {
-    private val cabinetModes = CabinetMode.values().copyOfRange(1, CabinetMode.values().size)
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CabinetModeViewHolder {
-        DialogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            .apply { root.setOnClickListener(this@CabinetLauncherDialogAdapter) }
-            .also { return CabinetModeViewHolder(it) }
-    }
-
-    override fun getItemCount(): Int = cabinetModes.size
-
-    override fun onBindViewHolder(holder: CabinetModeViewHolder, position: Int) =
-        holder.bind(cabinetModes[position])
-
-    override fun onClick(view: View) {
-        val mode = (view.tag as CabinetModeViewHolder).cabinetMode
-        val appletPath = NativeLibrary.getAppletLaunchPath(AppletInfo.Cabinet.entryId)
-        NativeLibrary.setCurrentAppletId(AppletInfo.Cabinet.appletId)
-        NativeLibrary.setCabinetMode(mode.id)
-        val appletGame = Game(
-            title = YuzuApplication.appContext.getString(R.string.cabinet_applet),
-            path = appletPath
-        )
-        val action = HomeNavigationDirections.actionGlobalEmulationActivity(appletGame)
-        fragment.findNavController().navigate(action)
-    }
-
-    inner class CabinetModeViewHolder(val binding: DialogListItemBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var cabinetMode: CabinetMode
-
-        init {
-            itemView.tag = this
-        }
-
-        fun bind(cabinetMode: CabinetMode) {
-            this.cabinetMode = cabinetMode
-            binding.icon.setImageDrawable(
-                ResourcesCompat.getDrawable(
-                    binding.icon.context.resources,
-                    cabinetMode.iconId,
-                    binding.icon.context.theme
-                )
-            )
-            binding.title.setText(cabinetMode.titleId)
-        }
-    }
-}
@@ -1,117 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.CardDriverOptionBinding
-import org.yuzu.yuzu_emu.model.DriverViewModel
-import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
-
-class DriverAdapter(private val driverViewModel: DriverViewModel) :
-    ListAdapter<Pair<String, GpuDriverMetadata>, DriverAdapter.DriverViewHolder>(
-        AsyncDifferConfig.Builder(DiffCallback()).build()
-    ) {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DriverViewHolder {
-        val binding =
-            CardDriverOptionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return DriverViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = currentList.size
-
-    override fun onBindViewHolder(holder: DriverViewHolder, position: Int) =
-        holder.bind(currentList[position])
-
-    private fun onSelectDriver(position: Int) {
-        driverViewModel.setSelectedDriverIndex(position)
-        notifyItemChanged(driverViewModel.previouslySelectedDriver)
-        notifyItemChanged(driverViewModel.selectedDriver)
-    }
-
-    private fun onDeleteDriver(driverData: Pair<String, GpuDriverMetadata>, position: Int) {
-        if (driverViewModel.selectedDriver > position) {
-            driverViewModel.setSelectedDriverIndex(driverViewModel.selectedDriver - 1)
-        }
-        if (GpuDriverHelper.customDriverData == driverData.second) {
-            driverViewModel.setSelectedDriverIndex(0)
-        }
-        driverViewModel.driversToDelete.add(driverData.first)
-        driverViewModel.removeDriver(driverData)
-        notifyItemRemoved(position)
-        notifyItemChanged(driverViewModel.selectedDriver)
-    }
-
-    inner class DriverViewHolder(val binding: CardDriverOptionBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        private lateinit var driverData: Pair<String, GpuDriverMetadata>
-
-        fun bind(driverData: Pair<String, GpuDriverMetadata>) {
-            this.driverData = driverData
-            val driver = driverData.second
-
-            binding.apply {
-                radioButton.isChecked = driverViewModel.selectedDriver == bindingAdapterPosition
-                root.setOnClickListener {
-                    onSelectDriver(bindingAdapterPosition)
-                }
-                buttonDelete.setOnClickListener {
-                    onDeleteDriver(driverData, bindingAdapterPosition)
-                }
-
-                // Delay marquee by 3s
-                title.postDelayed(
-                    {
-                        title.isSelected = true
-                        title.ellipsize = TextUtils.TruncateAt.MARQUEE
-                        version.isSelected = true
-                        version.ellipsize = TextUtils.TruncateAt.MARQUEE
-                        description.isSelected = true
-                        description.ellipsize = TextUtils.TruncateAt.MARQUEE
-                    },
-                    3000
-                )
-                if (driver.name == null) {
-                    title.setText(R.string.system_gpu_driver)
-                    description.text = ""
-                    version.text = ""
-                    version.visibility = View.GONE
-                    description.visibility = View.GONE
-                    buttonDelete.visibility = View.GONE
-                } else {
-                    title.text = driver.name
-                    version.text = driver.version
-                    description.text = driver.description
-                    version.visibility = View.VISIBLE
-                    description.visibility = View.VISIBLE
-                    buttonDelete.visibility = View.VISIBLE
-                }
-            }
-        }
-    }
-
-    private class DiffCallback : DiffUtil.ItemCallback<Pair<String, GpuDriverMetadata>>() {
-        override fun areItemsTheSame(
-            oldItem: Pair<String, GpuDriverMetadata>,
-            newItem: Pair<String, GpuDriverMetadata>
-        ): Boolean {
-            return oldItem.first == newItem.first
-        }
-
-        override fun areContentsTheSame(
-            oldItem: Pair<String, GpuDriverMetadata>,
-            newItem: Pair<String, GpuDriverMetadata>
-        ): Boolean {
-            return oldItem.second == newItem.second
-        }
-    }
-}
@@ -3,9 +3,8 @@

 package org.yuzu.yuzu_emu.adapters

-import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.drawable.LayerDrawable
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -14,29 +13,25 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.pm.ShortcutInfoCompat
-import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.IconCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.graphics.drawable.toDrawable
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import coil.load
+import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.HomeNavigationDirections
+import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolder
 import org.yuzu.yuzu_emu.databinding.CardGameBinding
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.GamesViewModel
-import org.yuzu.yuzu_emu.utils.GameIconUtils

 class GameAdapter(private val activity: AppCompatActivity) :
    ListAdapter<Game, GameViewHolder>(AsyncDifferConfig.Builder(DiffCallback()).build()),
@@ -87,34 +82,6 @@ class GameAdapter(private val activity: AppCompatActivity) :
            )
            .apply()

-        val openIntent = Intent(YuzuApplication.appContext, EmulationActivity::class.java).apply {
-            action = Intent.ACTION_VIEW
-            data = Uri.parse(holder.game.path)
-        }
-
-        val layerDrawable = ResourcesCompat.getDrawable(
-            YuzuApplication.appContext.resources,
-            R.drawable.shortcut,
-            null
-        ) as LayerDrawable
-        layerDrawable.setDrawableByLayerId(
-            R.id.shortcut_foreground,
-            GameIconUtils.getGameIcon(holder.game).toDrawable(YuzuApplication.appContext.resources)
-        )
-        val inset = YuzuApplication.appContext.resources
-            .getDimensionPixelSize(R.dimen.icon_inset)
-        layerDrawable.setLayerInset(1, inset, inset, inset, inset)
-        val shortcut = ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)
-            .setShortLabel(holder.game.title)
-            .setIcon(
-                IconCompat.createWithAdaptiveBitmap(
-                    layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)
-                )
-            )
-            .setIntent(openIntent)
-            .build()
-        ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)
-
        val action = HomeNavigationDirections.actionGlobalEmulationActivity(holder.game)
        view.findNavController().navigate(action)
    }
@@ -131,7 +98,12 @@ class GameAdapter(private val activity: AppCompatActivity) :
            this.game = game

            binding.imageGameScreen.scaleType = ImageView.ScaleType.CENTER_CROP
-            GameIconUtils.loadGameIcon(game, binding.imageGameScreen)
+            activity.lifecycleScope.launch {
+                val bitmap = decodeGameIcon(game.path)
+                binding.imageGameScreen.load(bitmap) {
+                    error(R.drawable.default_icon)
+                }
+            }

            binding.textGameTitle.text = game.title.replace("[\\t\\n\\r]+".toRegex(), " ")

@@ -147,11 +119,21 @@ class GameAdapter(private val activity: AppCompatActivity) :

    private class DiffCallback : DiffUtil.ItemCallback<Game>() {
        override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem.programId == newItem.programId
+            return oldItem.gameId == newItem.gameId
        }

        override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
            return oldItem == newItem
        }
    }
+
+    private fun decodeGameIcon(uri: String): Bitmap? {
+        val data = NativeLibrary.getIcon(uri)
+        return BitmapFactory.decodeByteArray(
+            data,
+            0,
+            data.size,
+            BitmapFactory.Options()
+        )
+    }
 }
@@ -3,29 +3,19 @@

 package org.yuzu.yuzu_emu.adapters

-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.CardHomeOptionBinding
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.HomeSetting

-class HomeSettingAdapter(
-    private val activity: AppCompatActivity,
-    private val viewLifecycle: LifecycleOwner,
-    var options: List<HomeSetting>
-) :
+class HomeSettingAdapter(private val activity: AppCompatActivity, var options: List<HomeSetting>) :
    RecyclerView.Adapter<HomeSettingAdapter.HomeOptionViewHolder>(),
    View.OnClickListener {
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HomeOptionViewHolder {
@@ -49,9 +39,8 @@ class HomeSettingAdapter(
            holder.option.onClick.invoke()
        } else {
            MessageDialogFragment.newInstance(
-                activity,
-                titleId = holder.option.disabledTitleId,
-                descriptionId = holder.option.disabledMessageId
+                holder.option.disabledTitleId,
+                holder.option.disabledMessageId
            ).show(activity.supportFragmentManager, MessageDialogFragment.TAG)
        }
    }
@@ -90,26 +79,6 @@ class HomeSettingAdapter(
                binding.optionDescription.alpha = 0.5f
                binding.optionIcon.alpha = 0.5f
            }
-
-            viewLifecycle.lifecycleScope.launch {
-                viewLifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    option.details.collect { updateOptionDetails(it) }
-                }
-            }
-            binding.optionDetail.postDelayed(
-                {
-                    binding.optionDetail.ellipsize = TextUtils.TruncateAt.MARQUEE
-                    binding.optionDetail.isSelected = true
-                },
-                3000
-            )
-        }
-
-        private fun updateOptionDetails(detailString: String) {
-            if (detailString.isNotEmpty()) {
-                binding.optionDetail.text = detailString
-                binding.optionDetail.visibility = View.VISIBLE
-            }
        }
    }
 }
@@ -1,49 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.databinding.CardInstallableBinding
-import org.yuzu.yuzu_emu.model.Installable
-
-class InstallableAdapter(private val installables: List<Installable>) :
-    RecyclerView.Adapter<InstallableAdapter.InstallableViewHolder>() {
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): InstallableAdapter.InstallableViewHolder {
-        val binding =
-            CardInstallableBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return InstallableViewHolder(binding)
-    }
-
-    override fun getItemCount(): Int = installables.size
-
-    override fun onBindViewHolder(holder: InstallableAdapter.InstallableViewHolder, position: Int) =
-        holder.bind(installables[position])
-
-    inner class InstallableViewHolder(val binding: CardInstallableBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        lateinit var installable: Installable
-
-        fun bind(installable: Installable) {
-            this.installable = installable
-
-            binding.title.setText(installable.titleId)
-            binding.description.setText(installable.descriptionId)
-
-            if (installable.install != null) {
-                binding.buttonInstall.visibility = View.VISIBLE
-                binding.buttonInstall.setOnClickListener { installable.install.invoke() }
-            }
-            if (installable.export != null) {
-                binding.buttonExport.visibility = View.VISIBLE
-                binding.buttonExport.setOnClickListener { installable.export.invoke() }
-            }
-        }
-    }
-}
@@ -49,7 +49,6 @@ class LicenseAdapter(private val activity: AppCompatActivity, var licenses: List
            val context = YuzuApplication.appContext
            binding.textSettingName.text = context.getString(license.titleId)
            binding.textSettingDescription.text = context.getString(license.descriptionId)
-            binding.textSettingValue.visibility = View.GONE
        }
    }
 }
@@ -5,19 +5,13 @@ package org.yuzu.yuzu_emu.adapters

 import android.text.Html
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.res.ResourcesCompat
-import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
 import org.yuzu.yuzu_emu.databinding.PageSetupBinding
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.SetupCallback
 import org.yuzu.yuzu_emu.model.SetupPage
-import org.yuzu.yuzu_emu.model.StepState
-import org.yuzu.yuzu_emu.utils.ViewUtils

 class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>) :
    RecyclerView.Adapter<SetupAdapter.SetupPageViewHolder>() {
@@ -32,7 +26,7 @@ class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>)
        holder.bind(pages[position])

    inner class SetupPageViewHolder(val binding: PageSetupBinding) :
-        RecyclerView.ViewHolder(binding.root), SetupCallback {
+        RecyclerView.ViewHolder(binding.root) {
        lateinit var page: SetupPage

        init {
@@ -41,12 +35,6 @@ class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>)

        fun bind(page: SetupPage) {
            this.page = page
-
-            if (page.stepCompleted.invoke() == StepState.COMPLETE) {
-                binding.buttonAction.visibility = View.INVISIBLE
-                binding.textConfirmation.visibility = View.VISIBLE
-            }
-
            binding.icon.setImageDrawable(
                ResourcesCompat.getDrawable(
                    activity.resources,
@@ -74,15 +62,9 @@ class SetupAdapter(val activity: AppCompatActivity, val pages: List<SetupPage>)
                        MaterialButton.ICON_GRAVITY_END
                    }
                setOnClickListener {
-                    page.buttonAction.invoke(this@SetupPageViewHolder)
+                    page.buttonAction.invoke()
                }
            }
        }
-
-        override fun onStepCompleted() {
-            ViewUtils.hideView(binding.buttonAction, 200)
-            ViewUtils.showView(binding.textConfirmation, 200)
-            ViewModelProvider(activity)[HomeViewModel::class.java].setShouldPageForward(true)
-        }
    }
 }
@@ -4,43 +4,43 @@
 package org.yuzu.yuzu_emu.disk_shader_cache

 import androidx.annotation.Keep
-import androidx.lifecycle.ViewModelProvider
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.activities.EmulationActivity
-import org.yuzu.yuzu_emu.model.EmulationViewModel
-import org.yuzu.yuzu_emu.utils.Log
+import org.yuzu.yuzu_emu.disk_shader_cache.ui.ShaderProgressDialogFragment

@Keep
 object DiskShaderCacheProgress {
-    private lateinit var emulationViewModel: EmulationViewModel
+    val finishLock = Object()
+    private lateinit var fragment: ShaderProgressDialogFragment

-    private fun prepareViewModel() {
-        emulationViewModel =
-            ViewModelProvider(
-                NativeLibrary.sEmulationActivity.get() as EmulationActivity
-            )[EmulationViewModel::class.java]
+    private fun prepareDialog() {
+        val emulationActivity = NativeLibrary.sEmulationActivity.get()!!
+        emulationActivity.runOnUiThread {
+            fragment = ShaderProgressDialogFragment.newInstance(
+                emulationActivity.getString(R.string.loading),
+                emulationActivity.getString(R.string.preparing_shaders)
+            )
+            fragment.show(
+                emulationActivity.supportFragmentManager,
+                ShaderProgressDialogFragment.TAG
+            )
+        }
+        synchronized(finishLock) { finishLock.wait() }
    }

    @JvmStatic
    fun loadProgress(stage: Int, progress: Int, max: Int) {
        val emulationActivity = NativeLibrary.sEmulationActivity.get()
-        if (emulationActivity == null) {
-            Log.error("[DiskShaderCacheProgress] EmulationActivity not present")
-            return
-        }
+            ?: error("[DiskShaderCacheProgress] EmulationActivity not present")

-        emulationActivity.runOnUiThread {
-            when (LoadCallbackStage.values()[stage]) {
-                LoadCallbackStage.Prepare -> prepareViewModel()
-                LoadCallbackStage.Build -> emulationViewModel.updateProgress(
-                    emulationActivity.getString(R.string.building_shaders),
-                    progress,
-                    max
-                )
-
-                LoadCallbackStage.Complete -> {}
-            }
+        when (LoadCallbackStage.values()[stage]) {
+            LoadCallbackStage.Prepare -> prepareDialog()
+            LoadCallbackStage.Build -> fragment.onUpdateProgress(
+                emulationActivity.getString(R.string.building_shaders),
+                progress,
+                max
+            )
+            LoadCallbackStage.Complete -> fragment.dismiss()
        }
    }

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.disk_shader_cache
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class ShaderProgressViewModel : ViewModel() {
+    private val _progress = MutableLiveData(0)
+    val progress: LiveData<Int> get() = _progress
+
+    private val _max = MutableLiveData(0)
+    val max: LiveData<Int> get() = _max
+
+    private val _message = MutableLiveData("")
+    val message: LiveData<String> get() = _message
+
+    fun setProgress(progress: Int) {
+        _progress.postValue(progress)
+    }
+
+    fun setMax(max: Int) {
+        _max.postValue(max)
+    }
+
+    fun setMessage(msg: String) {
+        _message.postValue(msg)
+    }
+}
@@ -0,0 +1,103 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.disk_shader_cache.ui
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
+import org.yuzu.yuzu_emu.disk_shader_cache.DiskShaderCacheProgress
+import org.yuzu.yuzu_emu.disk_shader_cache.ShaderProgressViewModel
+
+class ShaderProgressDialogFragment : DialogFragment() {
+    private var _binding: DialogProgressBarBinding? = null
+    private val binding get() = _binding!!
+
+    private lateinit var alertDialog: AlertDialog
+
+    private lateinit var shaderProgressViewModel: ShaderProgressViewModel
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        _binding = DialogProgressBarBinding.inflate(layoutInflater)
+        shaderProgressViewModel =
+            ViewModelProvider(requireActivity())[ShaderProgressViewModel::class.java]
+
+        val title = requireArguments().getString(TITLE)
+        val message = requireArguments().getString(MESSAGE)
+
+        isCancelable = false
+        alertDialog = MaterialAlertDialogBuilder(requireActivity())
+            .setView(binding.root)
+            .setTitle(title)
+            .setMessage(message)
+            .create()
+        return alertDialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        shaderProgressViewModel.progress.observe(viewLifecycleOwner) { progress ->
+            binding.progressBar.progress = progress
+            setUpdateText()
+        }
+        shaderProgressViewModel.max.observe(viewLifecycleOwner) { max ->
+            binding.progressBar.max = max
+            setUpdateText()
+        }
+        shaderProgressViewModel.message.observe(viewLifecycleOwner) { msg ->
+            alertDialog.setMessage(msg)
+        }
+        synchronized(DiskShaderCacheProgress.finishLock) {
+            DiskShaderCacheProgress.finishLock.notifyAll()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    fun onUpdateProgress(msg: String, progress: Int, max: Int) {
+        shaderProgressViewModel.setProgress(progress)
+        shaderProgressViewModel.setMax(max)
+        shaderProgressViewModel.setMessage(msg)
+    }
+
+    private fun setUpdateText() {
+        binding.progressText.text = String.format(
+            "%d/%d",
+            shaderProgressViewModel.progress.value,
+            shaderProgressViewModel.max.value
+        )
+    }
+
+    companion object {
+        const val TAG = "ProgressDialogFragment"
+        const val TITLE = "title"
+        const val MESSAGE = "message"
+
+        fun newInstance(title: String, message: String): ShaderProgressDialogFragment {
+            val frag = ShaderProgressDialogFragment()
+            val args = Bundle()
+            args.putString(TITLE, title)
+            args.putString(MESSAGE, message)
+            frag.arguments = args
+            return frag
+        }
+    }
+}
@@ -4,7 +4,5 @@
 package org.yuzu.yuzu_emu.features.settings.model

 interface AbstractBooleanSetting : AbstractSetting {
-    val boolean: Boolean
-
-    fun setBoolean(value: Boolean)
+    var boolean: Boolean
 }
@@ -4,7 +4,5 @@
 package org.yuzu.yuzu_emu.features.settings.model

 interface AbstractFloatSetting : AbstractSetting {
-    val float: Float
-
-    fun setFloat(value: Float)
+    var float: Float
 }
@@ -4,7 +4,5 @@
 package org.yuzu.yuzu_emu.features.settings.model

 interface AbstractIntSetting : AbstractSetting {
-    val int: Int
-
-    fun setInt(value: Int)
+    var int: Int
 }
@@ -1,10 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-interface AbstractLongSetting : AbstractSetting {
-    val long: Long
-
-    fun setLong(value: Long)
-}
@@ -3,22 +3,10 @@

 package org.yuzu.yuzu_emu.features.settings.model

-import org.yuzu.yuzu_emu.utils.NativeConfig
-
 interface AbstractSetting {
-    val key: String
-    val category: Settings.Category
-    val defaultValue: Any
-    val androidDefault: Any?
-        get() = null
+    val key: String?
+    val section: String?
+    val isRuntimeEditable: Boolean
    val valueAsString: String
-        get() = ""
-
-    val isRuntimeModifiable: Boolean
-        get() = NativeConfig.getIsRuntimeModifiable(key)
-
-    val pairedSettingKey: String
-        get() = NativeConfig.getPairedSettingKey(key)
-
-    fun reset()
+    val defaultValue: Any
 }
@@ -1,10 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-interface AbstractShortSetting : AbstractSetting {
-    val short: Short
-
-    fun setShort(value: Short)
-}
@@ -4,7 +4,5 @@
 package org.yuzu.yuzu_emu.features.settings.model

 interface AbstractStringSetting : AbstractSetting {
-    val string: String
-
-    fun setString(value: String)
+    var string: String
 }
@@ -3,38 +3,41 @@

 package org.yuzu.yuzu_emu.features.settings.model

-import org.yuzu.yuzu_emu.utils.NativeConfig
-
 enum class BooleanSetting(
    override val key: String,
-    override val category: Settings.Category,
-    override val androidDefault: Boolean? = null
+    override val section: String,
+    override val defaultValue: Boolean
 ) : AbstractBooleanSetting {
-    AUDIO_MUTED("audio_muted", Settings.Category.Audio),
-    CPU_DEBUG_MODE("cpu_debug_mode", Settings.Category.Cpu),
-    FASTMEM("cpuopt_fastmem", Settings.Category.Cpu),
-    FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.Category.Cpu),
-    RENDERER_USE_SPEED_LIMIT("use_speed_limit", Settings.Category.Core),
-    USE_DOCKED_MODE("use_docked_mode", Settings.Category.System, false),
-    RENDERER_USE_DISK_SHADER_CACHE("use_disk_shader_cache", Settings.Category.Renderer),
-    RENDERER_FORCE_MAX_CLOCK("force_max_clock", Settings.Category.Renderer),
-    RENDERER_ASYNCHRONOUS_SHADERS("use_asynchronous_shaders", Settings.Category.Renderer),
-    RENDERER_REACTIVE_FLUSHING("use_reactive_flushing", Settings.Category.Renderer, false),
-    RENDERER_DEBUG("debug", Settings.Category.Renderer),
-    PICTURE_IN_PICTURE("picture_in_picture", Settings.Category.Android),
-    USE_CUSTOM_RTC("custom_rtc_enabled", Settings.Category.System);
+    CPU_DEBUG_MODE("cpu_debug_mode", Settings.SECTION_CPU, false),
+    FASTMEM("cpuopt_fastmem", Settings.SECTION_CPU, true),
+    FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.SECTION_CPU, true),
+    PICTURE_IN_PICTURE("picture_in_picture", Settings.SECTION_GENERAL, true),
+    USE_CUSTOM_RTC("custom_rtc_enabled", Settings.SECTION_SYSTEM, false);

-    override val boolean: Boolean
-        get() = NativeConfig.getBoolean(key, false)
-
-    override fun setBoolean(value: Boolean) = NativeConfig.setBoolean(key, value)
-
-    override val defaultValue: Boolean by lazy {
-        androidDefault ?: NativeConfig.getBoolean(key, true)
-    }
+    override var boolean: Boolean = defaultValue

    override val valueAsString: String
-        get() = if (boolean) "1" else "0"
+        get() = boolean.toString()

-    override fun reset() = NativeConfig.setBoolean(key, defaultValue)
+    override val isRuntimeEditable: Boolean
+        get() {
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) {
+                    return false
+                }
+            }
+            return true
+        }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE = listOf(
+            PICTURE_IN_PICTURE,
+            USE_CUSTOM_RTC
+        )
+
+        fun from(key: String): BooleanSetting? =
+            BooleanSetting.values().firstOrNull { it.key == key }
+
+        fun clear() = BooleanSetting.values().forEach { it.boolean = it.defaultValue }
+    }
 }
@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-import org.yuzu.yuzu_emu.utils.NativeConfig
-
-enum class ByteSetting(
-    override val key: String,
-    override val category: Settings.Category
-) : AbstractByteSetting {
-    AUDIO_VOLUME("volume", Settings.Category.Audio);
-
-    override val byte: Byte
-        get() = NativeConfig.getByte(key, false)
-
-    override fun setByte(value: Byte) = NativeConfig.setByte(key, value)
-
-    override val defaultValue: Byte by lazy { NativeConfig.getByte(key, true) }
-
-    override val valueAsString: String
-        get() = byte.toString()
-
-    override fun reset() = NativeConfig.setByte(key, defaultValue)
-}
@@ -3,24 +3,34 @@

 package org.yuzu.yuzu_emu.features.settings.model

-import org.yuzu.yuzu_emu.utils.NativeConfig
-
 enum class FloatSetting(
    override val key: String,
-    override val category: Settings.Category
+    override val section: String,
+    override val defaultValue: Float
 ) : AbstractFloatSetting {
    // No float settings currently exist
-    EMPTY_SETTING("", Settings.Category.UiGeneral);
+    EMPTY_SETTING("", "", 0f);

-    override val float: Float
-        get() = NativeConfig.getFloat(key, false)
-
-    override fun setFloat(value: Float) = NativeConfig.setFloat(key, value)
-
-    override val defaultValue: Float by lazy { NativeConfig.getFloat(key, true) }
+    override var float: Float = defaultValue

    override val valueAsString: String
        get() = float.toString()

-    override fun reset() = NativeConfig.setFloat(key, defaultValue)
+    override val isRuntimeEditable: Boolean
+        get() {
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) {
+                    return false
+                }
+            }
+            return true
+        }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE = emptyList<FloatSetting>()
+
+        fun from(key: String): FloatSetting? = FloatSetting.values().firstOrNull { it.key == key }
+
+        fun clear() = FloatSetting.values().forEach { it.float = it.defaultValue }
+    }
 }
@@ -3,37 +3,139 @@

 package org.yuzu.yuzu_emu.features.settings.model

-import org.yuzu.yuzu_emu.utils.NativeConfig
-
 enum class IntSetting(
    override val key: String,
-    override val category: Settings.Category,
-    override val androidDefault: Int? = null
+    override val section: String,
+    override val defaultValue: Int
 ) : AbstractIntSetting {
-    CPU_ACCURACY("cpu_accuracy", Settings.Category.Cpu),
-    REGION_INDEX("region_index", Settings.Category.System),
-    LANGUAGE_INDEX("language_index", Settings.Category.System),
-    RENDERER_BACKEND("backend", Settings.Category.Renderer),
-    RENDERER_ACCURACY("gpu_accuracy", Settings.Category.Renderer, 0),
-    RENDERER_RESOLUTION("resolution_setup", Settings.Category.Renderer),
-    RENDERER_VSYNC("use_vsync", Settings.Category.Renderer),
-    RENDERER_SCALING_FILTER("scaling_filter", Settings.Category.Renderer),
-    RENDERER_ANTI_ALIASING("anti_aliasing", Settings.Category.Renderer),
-    RENDERER_SCREEN_LAYOUT("screen_layout", Settings.Category.Android),
-    RENDERER_ASPECT_RATIO("aspect_ratio", Settings.Category.Renderer),
-    AUDIO_OUTPUT_ENGINE("output_engine", Settings.Category.Audio);
+    RENDERER_USE_SPEED_LIMIT(
+        "use_speed_limit",
+        Settings.SECTION_RENDERER,
+        1
+    ),
+    USE_DOCKED_MODE(
+        "use_docked_mode",
+        Settings.SECTION_SYSTEM,
+        0
+    ),
+    RENDERER_USE_DISK_SHADER_CACHE(
+        "use_disk_shader_cache",
+        Settings.SECTION_RENDERER,
+        1
+    ),
+    RENDERER_FORCE_MAX_CLOCK(
+        "force_max_clock",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_ASYNCHRONOUS_SHADERS(
+        "use_asynchronous_shaders",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_REACTIVE_FLUSHING(
+        "use_reactive_flushing",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_DEBUG(
+        "debug",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_SPEED_LIMIT(
+        "speed_limit",
+        Settings.SECTION_RENDERER,
+        100
+    ),
+    CPU_ACCURACY(
+        "cpu_accuracy",
+        Settings.SECTION_CPU,
+        0
+    ),
+    REGION_INDEX(
+        "region_index",
+        Settings.SECTION_SYSTEM,
+        -1
+    ),
+    LANGUAGE_INDEX(
+        "language_index",
+        Settings.SECTION_SYSTEM,
+        1
+    ),
+    RENDERER_BACKEND(
+        "backend",
+        Settings.SECTION_RENDERER,
+        1
+    ),
+    RENDERER_ACCURACY(
+        "gpu_accuracy",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_RESOLUTION(
+        "resolution_setup",
+        Settings.SECTION_RENDERER,
+        2
+    ),
+    RENDERER_VSYNC(
+        "use_vsync",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_SCALING_FILTER(
+        "scaling_filter",
+        Settings.SECTION_RENDERER,
+        1
+    ),
+    RENDERER_ANTI_ALIASING(
+        "anti_aliasing",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    RENDERER_SCREEN_LAYOUT(
+        "screen_layout",
+        Settings.SECTION_RENDERER,
+        Settings.LayoutOption_MobileLandscape
+    ),
+    RENDERER_ASPECT_RATIO(
+        "aspect_ratio",
+        Settings.SECTION_RENDERER,
+        0
+    ),
+    AUDIO_VOLUME(
+        "volume",
+        Settings.SECTION_AUDIO,
+        100
+    );

-    override val int: Int
-        get() = NativeConfig.getInt(key, false)
-
-    override fun setInt(value: Int) = NativeConfig.setInt(key, value)
-
-    override val defaultValue: Int by lazy {
-        androidDefault ?: NativeConfig.getInt(key, true)
-    }
+    override var int: Int = defaultValue

    override val valueAsString: String
        get() = int.toString()

-    override fun reset() = NativeConfig.setInt(key, defaultValue)
+    override val isRuntimeEditable: Boolean
+        get() {
+            for (setting in NOT_RUNTIME_EDITABLE) {
+                if (setting == this) {
+                    return false
+                }
+            }
+            return true
+        }
+
+    companion object {
+        private val NOT_RUNTIME_EDITABLE = listOf(
+            RENDERER_USE_DISK_SHADER_CACHE,
+            RENDERER_ASYNCHRONOUS_SHADERS,
+            RENDERER_DEBUG,
+            RENDERER_BACKEND,
+            RENDERER_RESOLUTION,
+            RENDERER_VSYNC
+        )
+
+        fun from(key: String): IntSetting? = IntSetting.values().firstOrNull { it.key == key }
+
+        fun clear() = IntSetting.values().forEach { it.int = it.defaultValue }
+    }
 }
@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.features.settings.model
-
-import org.yuzu.yuzu_emu.utils.NativeConfig
-
-enum class LongSetting(
-    override val key: String,
-    override val category: Settings.Category
-) : AbstractLongSetting {
-    CUSTOM_RTC("custom_rtc", Settings.Category.System);
-
-    override val long: Long
-        get() = NativeConfig.getLong(key, false)
-
-    override fun setLong(value: Long) = NativeConfig.setLong(key, value)
-
-    override val defaultValue: Long by lazy { NativeConfig.getLong(key, true) }
-
-    override val valueAsString: String
-        get() = long.toString()
-
-    override fun reset() = NativeConfig.setLong(key, defaultValue)
-}
@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.features.settings.model
+
+/**
+ * A semantically-related group of Settings objects. These Settings are
+ * internally stored as a HashMap.
+ */
+class SettingSection(val name: String) {
+    val settings = HashMap<String, AbstractSetting>()
+
+    /**
+     * Convenience method; inserts a value directly into the backing HashMap.
+     *
+     * @param setting The Setting to be inserted.
+     */
+    fun putSetting(setting: AbstractSetting) {
+        settings[setting.key!!] = setting
+    }
+
+    /**
+     * Convenience method; gets a value directly from the backing HashMap.
+     *
+     * @param key Used to retrieve the Setting.
+     * @return A Setting object (you should probably cast this before using)
+     */
+    fun getSetting(key: String): AbstractSetting? {
+        return settings[key]
+    }
+
+    fun mergeSection(settingSection: SettingSection) {
+        for (setting in settingSection.settings.values) {
+            putSetting(setting)
+        }
+    }
+}
--- a/Show More
+++ b/Show More