Update some barriers

.ci/license-header.sh

@@ -1,13 +1,13 @@
 #!/bin/sh -e
 
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # specify full path if dupes may exist
 EXCLUDE_FILES="CPM.cmake CPMUtil.cmake GetSCMRev.cmake renderdoc_app.h tools/cpm tools/shellcheck.sh tools/update-cpm.sh tools/windows/vcvarsall.sh externals/stb externals/glad externals/getopt externals/gamemode externals/FidelityFX-FSR externals/demangle externals/bc_decoder externals/cmake-modules"
 
 # license header constants, please change when needed :))))
-YEAR=2026
+YEAR=2025
 HOLDER="Eden Emulator Project"
 LICENSE="GPL-3.0-or-later"
 
@@ -113,7 +113,7 @@ for file in $FILES; do
 	[ "$excluded" = "true" ] && continue
 
 	case "$file" in
-		*.cmake|*.sh|*CMakeLists.txt)
+		*.cmake|*.sh|CMakeLists.txt)
 			begin="#"
 			;;
 		*.kt*|*.cpp|*.h)
@@ -186,7 +186,7 @@ if [ "$UPDATE" = "true" ]; then
 
 	for file in $SRC_FILES $OTHER_FILES; do
 		case $(basename -- "$file") in
-			*.cmake|*CMakeLists.txt)
+			*.cmake|CMakeLists.txt)
 				begin="#"
 				shell="false"
 				;;

.patch/mbedtls/0002-arm64-aes-fix.patch

@@ -9,11 +9,11 @@ index 50f2a29..c60d9dc 100644
 -#if defined(__ARM_NEON)
 -#include <arm_neon.h>
 +#if defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
-+#include <arm64_neon.h>
++#include <arm64_neon.h.h>
  #define MBEDTLS_HAVE_NEON_INTRINSICS
 -#elif defined(MBEDTLS_PLATFORM_IS_WINDOWS_ON_ARM64)
 -#include <arm64_neon.h>
-+#elif (defined(__ANDROID__) && defined(__ARM_FP)) || defined(__ARM_NEON)
++#elif defined(__ANDROID__) || defined(__ARM_NEON)
 +#include <arm_neon.h>
  #define MBEDTLS_HAVE_NEON_INTRINSICS
  #endif

CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 cmake_minimum_required(VERSION 3.22)
@@ -13,13 +13,13 @@ set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm)
 include(DetectPlatform)
 include(DetectArchitecture)
 include(DefaultConfig)
-include(UseLTO)
-include(FasterLinker)
-include(UseCcache)
+include(DownloadExternals)
 include(CMakeDependentOption)
 include(CTest)
 include(CPMUtil)
 
+DetectArchitecture()
+
 if (NOT DEFINED ARCHITECTURE)
     message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?")
 endif()
@@ -41,26 +41,13 @@ if (PLATFORM_NETBSD)
     set(ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:${CMAKE_SYSROOT}/usr/pkg/lib/ffmpeg7/pkgconfig")
 endif()
 
-# qt stuff
-option(ENABLE_QT "Enable the Qt frontend" ON)
-option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
-option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)
-option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
-cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF "NOT YUZU_USE_BUNDLED_QT" OFF)
-set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
-cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
-
-# non-linux bundled qt are static
-if (YUZU_USE_BUNDLED_QT AND (APPLE OR NOT UNIX))
-    set(YUZU_STATIC_BUILD ON)
-endif()
-
-# TODO: does mingw need any of this anymore
 # static stuff
 option(YUZU_STATIC_BUILD "Use static libraries and executables if available" OFF)
 
 # TODO: StaticBuild.cmake
 if (YUZU_STATIC_BUILD)
+    include(StaticQtLibs)
+
     # lol
     set(Boost_USE_STATIC_LIBS ON)
     set(BUILD_SHARED_LIBS OFF)
@@ -134,13 +121,15 @@ if (CXX_CLANG_CL)
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
         $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
-        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>)
+        $<$<COMPILE_LANGUAGE:C,CXX>:/EHsc> # thanks microsoft
+    )
 
     # REQUIRED CPU features IN Windows-amd64
     if (ARCHITECTURE_x86_64)
         add_compile_options(
             $<$<COMPILE_LANGUAGE:C,CXX>:-msse4.1>
-            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>)
+            $<$<COMPILE_LANGUAGE:C,CXX>:-mcx16>
+        )
     endif()
 endif()
 
@@ -157,13 +146,21 @@ cmake_dependent_option(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" O
 cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "ENABLE_SDL2;NOT MSVC" OFF)
 cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "ENABLE_SDL2" OFF)
 
+# qt stuff
+option(ENABLE_QT "Enable the Qt frontend" ON)
+option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
+option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)
+cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
+option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
+option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)
+set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
+
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
 set(EXT_DEFAULT OFF)
 if (MSVC OR ANDROID)
     set(EXT_DEFAULT ON)
 endif()
-
 option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})
 
 # ffmpeg
@@ -172,10 +169,9 @@ cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from external sour
 
 # sirit
 set(BUNDLED_SIRIT_DEFAULT OFF)
-if (MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Deb") OR ANDROID)
+if ((MSVC AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo") OR ANDROID))
     set(BUNDLED_SIRIT_DEFAULT ON)
 endif()
-
 option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT})
 
 # FreeBSD 15+ has libusb, versions below should disable it
@@ -191,6 +187,35 @@ cmake_dependent_option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF
 
 option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
+option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
+if(YUZU_ENABLE_LTO)
+    include(UseLTO)
+endif()
+
+option(USE_CCACHE "Use ccache for compilation" OFF)
+set(CCACHE_PATH "ccache" CACHE STRING "Path to ccache binary")
+if(USE_CCACHE)
+    find_program(CCACHE_BINARY ${CCACHE_PATH})
+    if(CCACHE_BINARY)
+        message(STATUS "Found ccache at: ${CCACHE_BINARY}")
+        set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_BINARY})
+        set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_BINARY})
+    else()
+        message(FATAL_ERROR "USE_CCACHE enabled, but no executable found at: ${CCACHE_PATH}")
+    endif()
+    # Follow SCCache recommendations:
+    # <https://github.com/mozilla/sccache/blob/main/README.md?plain=1#L144>
+    if(WIN32)
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+            string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+        elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+            string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+            string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+        endif()
+    endif()
+endif()
+
 option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
 
 option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.g. Snapdragon 865) at the cost of performance" OFF)
@@ -205,6 +230,8 @@ cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support"
 option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)
 set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")
 
+cmake_dependent_option(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "PLATFORM_LINUX" OFF)
+
 cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)
 
 option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)
@@ -225,16 +252,15 @@ if (ENABLE_WEB_SERVICE OR USE_DISCORD_PRESENCE)
 endif()
 
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
-
 if (ENABLE_OPENSSL)
     set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL OFF)
     if (EXT_DEFAULT OR PLATFORM_SUN)
         set(DEFAULT_YUZU_USE_BUNDLED_OPENSSL ON)
     endif()
+    option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL})
 endif()
 
-cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ${DEFAULT_YUZU_USE_BUNDLED_OPENSSL} "ENABLE_OPENSSL" OFF)
-
+# TODO(crueter): CPM this
 if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
     AddJsonPackage(vulkan-validation-layers)
 
@@ -298,51 +324,44 @@ if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32
 endif()
 
 # Build/optimization presets
-if (CXX_GCC OR CXX_CLANG)
+if (PLATFORM_LINUX OR CXX_CLANG)
     if (ARCHITECTURE_x86_64)
         # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
         # Generic supports Pentium Pro instruction set and above
-        # TODO: if a value is unknown, pass that as march and mtune
         set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, v3, zen2, zen4, native")
-
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-            set(march x86-64)
-            set(mtune generic)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "v3")
-            set(march x86-64-v3)
-            set(mtune generic)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64-v3 -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64-v3 -mtune=generic")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "zen2")
-            set(march znver2)
-            set(mtune znver2)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=znver2 -mtune=znver2")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=znver2 -mtune=znver2")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "zen4")
-            set(march znver4)
-            set(mtune znver4)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=znver4 -mtune=znver4")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=znver4 -mtune=znver4")
+        elseif (${YUZU_BUILD_PRESET} STREQUAL "native")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mtune=native")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native")
         endif()
     elseif(ARCHITECTURE_arm64)
         # See https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
         set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, armv9, native")
-        set(mtune generic)
-
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-            set(march armv8-a)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a -mtune=generic")
         elseif (${YUZU_BUILD_PRESET} STREQUAL "armv9")
-            set(march armv9-a)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv9-a -mtune=generic")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv9-a -mtune=generic")
+        elseif (${YUZU_BUILD_PRESET} STREQUAL "native")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mtune=native")
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native")
         endif()
     endif()
-
-    if ("${YUZU_BUILD_PRESET}" STREQUAL "native")
-        set(march native)
-        set(mtune native)
-    endif()
-
-    if (DEFINED march AND DEFINED mtune)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${march} -mtune=${mtune}")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${march} -mtune=${mtune}")
-    endif()
 endif()
 
 # Other presets, e.g. steamdeck
-# TODO(crueter): Just have every Linux/Windows use old sdl2
 set(YUZU_SYSTEM_PROFILE "generic" CACHE STRING "CMake and Externals profile to use. One of: generic, steamdeck")
 
 # Configure C++ standard
@@ -357,14 +376,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # System imported libraries
 # =======================================================================
 
-# Prefer the -pthread flag on Linux.
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-
 # openssl funniness
 if (ENABLE_OPENSSL)
     if (YUZU_USE_BUNDLED_OPENSSL)
-        set(BUILD_SHARED_LIBS OFF)
         AddJsonPackage(openssl)
         if (OpenSSL_ADDED)
             add_compile_definitions(YUZU_BUNDLED_OPENSSL)
@@ -527,6 +541,10 @@ elseif (WIN32)
     endif()
 elseif (PLATFORM_HAIKU)
     # Haiku is so special :)
+    # Some fucking genius decided to name an entire module "network" in 2019
+    # this caused great disaster amongst the Haiku community who had came first with
+    # their "libnetwork.so"; since CMake doesn't do magic, we have to use an ABSOLUTE PATH
+    # to the library itself, otherwise it will think we are linking to... our network thing
     set(PLATFORM_LIBRARIES bsd /boot/system/lib/libnetwork.so)
 elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")
     set(PLATFORM_LIBRARIES rt)
@@ -545,17 +563,17 @@ find_package(VulkanUtilityLibraries)
 find_package(SimpleIni)
 find_package(SPIRV-Tools)
 find_package(sirit)
-find_package(gamemode)
-find_package(mcl)
-
-if (ARCHITECTURE_riscv64)
-    find_package(biscuit)
-endif()
+find_package(gamemode) 
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
 endif()
 
+if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
+    # Workaround: httplib will kill itself if you attempt to do a find_package propagation
+    # find_package(httplib CONFIG)
+endif()
+
 if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
     find_package(cpp-jwt)
 endif()
@@ -580,17 +598,9 @@ if (YUZU_TESTS OR DYNARMIC_TESTS)
     find_package(Catch2)
 endif()
 
-# Qt stuff
 if (ENABLE_QT)
     if (YUZU_USE_BUNDLED_QT)
-        # Qt 6.8+ is broken on macOS (??)
-        if (APPLE)
-            AddQt(6.7.3)
-        else()
-            AddQt(6.9.3)
-        endif()
-
-        set(YUZU_STATIC_BUILD ON)
+        download_qt(6.8.3)
     else()
         message(STATUS "Using system Qt")
         if (NOT Qt6_DIR)
@@ -599,13 +609,13 @@ if (ENABLE_QT)
         list(APPEND CMAKE_PREFIX_PATH "${Qt6_DIR}")
     endif()
 
-    find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets Concurrent)
+    find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
 
     if (YUZU_USE_QT_MULTIMEDIA)
         find_package(Qt6 REQUIRED COMPONENTS Multimedia)
     endif()
 
-    if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
+    if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         # yes Qt, we get it
         set(QT_NO_PRIVATE_MODULE_WARNING ON)
         find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
@@ -634,24 +644,28 @@ if (ENABLE_QT)
 
     message(STATUS "Using target Qt at ${QT_TARGET_PATH}")
     message(STATUS "Using host Qt at ${QT_HOST_PATH}")
+endif()
 
-    ## Components ##
-
+function(set_yuzu_qt_components)
     # Best practice is to ask for all components at once, so they are from the same version
-    set(YUZU_QT_COMPONENTS Core Widgets Concurrent)
+    set(YUZU_QT_COMPONENTS2 Core Widgets Concurrent)
     if (PLATFORM_LINUX)
-        list(APPEND YUZU_QT_COMPONENTS DBus)
+        list(APPEND YUZU_QT_COMPONENTS2 DBus)
     endif()
     if (YUZU_USE_QT_MULTIMEDIA)
-        list(APPEND YUZU_QT_COMPONENTS Multimedia)
+        list(APPEND YUZU_QT_COMPONENTS2 Multimedia)
     endif()
     if (YUZU_USE_QT_WEB_ENGINE)
-        list(APPEND YUZU_QT_COMPONENTS WebEngineCore WebEngineWidgets)
+        list(APPEND YUZU_QT_COMPONENTS2 WebEngineCore WebEngineWidgets)
     endif()
     if (ENABLE_QT_TRANSLATION)
-        list(APPEND YUZU_QT_COMPONENTS LinguistTools)
+        list(APPEND YUZU_QT_COMPONENTS2 LinguistTools)
     endif()
+    set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
+endfunction(set_yuzu_qt_components)
 
+if(ENABLE_QT)
+    set_yuzu_qt_components()
     find_package(Qt6 REQUIRED COMPONENTS ${YUZU_QT_COMPONENTS})
     set(QT_MAJOR_VERSION 6)
     # Qt6 sets cxx_std_17 and we need to undo that
@@ -669,18 +683,21 @@ if (NOT (YUZU_USE_BUNDLED_FFMPEG OR YUZU_USE_EXTERNAL_FFMPEG))
 endif()
 
 if (WIN32 AND YUZU_CRASH_DUMPS)
-    message(STATUS "YUZU_CRASH_DUMPS is unimplemented on Windows. Check back later.")
-    # set(BREAKPAD_VER "breakpad-c89f9dd")
-    # download_bundled_external("breakpad/" ${BREAKPAD_VER} "breakpad-win" BREAKPAD_PREFIX "c89f9dd")
+    set(BREAKPAD_VER "breakpad-c89f9dd")
+    download_bundled_external("breakpad/" ${BREAKPAD_VER} "breakpad-win" BREAKPAD_PREFIX "c89f9dd")
 
-    # set(BREAKPAD_CLIENT_INCLUDE_DIR "${BREAKPAD_PREFIX}/include")
-    # set(BREAKPAD_CLIENT_LIBRARY "${BREAKPAD_PREFIX}/lib/libbreakpad_client.lib")
+    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}")
+    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)
+
 # Include source code
 # ===================
 
@@ -708,11 +725,16 @@ if (MSVC AND CXX_CLANG)
 
     add_library(llvm-mingw-runtime STATIC IMPORTED)
     set_target_properties(llvm-mingw-runtime PROPERTIES
-        IMPORTED_LOCATION "${LIB_PATH}")
+        IMPORTED_LOCATION "${LIB_PATH}"
+    )
 
     link_libraries(llvm-mingw-runtime)
 endif()
 
+if (YUZU_USE_FASTER_LD)
+    include(FasterLinker)
+endif()
+
 # Set runtime library to MD/MDd for all configurations
 if(MSVC)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")

CMakeModules/CPM.cmake

@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This is a slightly modified version of CPM.cmake
+
 # CPM.cmake - CMake's missing package manager
 # ===========================================
 # See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions.

CMakeModules/CPMUtil.cmake

@@ -1,5 +1,5 @@
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)
 
@@ -23,17 +23,8 @@ set(CPMUTIL_JSON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpmfile.json")
 
 if(EXISTS ${CPMUTIL_JSON_FILE})
     file(READ ${CPMUTIL_JSON_FILE} CPMFILE_CONTENT)
-    if (NOT TARGET cpmfiles)
-        add_custom_target(cpmfiles)
-    endif()
-
-    target_sources(cpmfiles PRIVATE ${CPMUTIL_JSON_FILE})
-    set_property(DIRECTORY APPEND PROPERTY
-        CMAKE_CONFIGURE_DEPENDS
-        "${CPMUTIL_JSON_FILE}")
 else()
-    message(DEBUG "[CPMUtil] cpmfile ${CPMUTIL_JSON_FILE}"
-        "does not exist, AddJsonPackage will be a no-op")
+    message(WARNING "[CPMUtil] cpmfile ${CPMUTIL_JSON_FILE} does not exist, AddJsonPackage will be a no-op")
 endif()
 
 # Utility stuff
@@ -77,10 +68,10 @@ function(AddJsonPackage)
     set(oneValueArgs
         NAME
 
-        # these are overrides that can be generated at runtime,
-        # so can be defined separately from the json
+        # these are overrides that can be generated at runtime, so can be defined separately from the json
         DOWNLOAD_ONLY
-        BUNDLED_PACKAGE)
+        BUNDLED_PACKAGE
+    )
 
     set(multiValueArgs OPTIONS)
 
@@ -95,8 +86,7 @@ function(AddJsonPackage)
     endif()
 
     if(NOT DEFINED CPMFILE_CONTENT)
-        cpm_utils_message(WARNING ${name}
-            "No cpmfile, AddJsonPackage is a no-op")
+        cpm_utils_message(WARNING ${name} "No cpmfile, AddJsonPackage is a no-op")
         return()
     endif()
 
@@ -104,8 +94,7 @@ function(AddJsonPackage)
         cpm_utils_message(FATAL_ERROR "json package" "No name specified")
     endif()
 
-    string(JSON object ERROR_VARIABLE
-        err GET "${CPMFILE_CONTENT}" "${JSON_NAME}")
+    string(JSON object ERROR_VARIABLE err GET "${CPMFILE_CONTENT}" "${JSON_NAME}")
 
     if(err)
         cpm_utils_message(FATAL_ERROR ${JSON_NAME} "Not found in cpmfile")
@@ -123,8 +112,7 @@ function(AddJsonPackage)
         get_json_element("${object}" raw_disabled disabled_platforms "")
 
         if(raw_disabled)
-            array_to_list("${raw_disabled}"
-                ${raw_disabled_LENGTH} disabled_platforms)
+            array_to_list("${raw_disabled}" ${raw_disabled_LENGTH} disabled_platforms)
         else()
             set(disabled_platforms "")
         endif()
@@ -136,7 +124,8 @@ function(AddJsonPackage)
             PACKAGE ${package}
             EXTENSION ${extension}
             MIN_VERSION ${min_version}
-            DISABLED_PLATFORMS ${disabled_platforms})
+            DISABLED_PLATFORMS ${disabled_platforms}
+        )
 
         # pass stuff to parent scope
         set(${package}_ADDED "${${package}_ADDED}"
@@ -164,10 +153,8 @@ function(AddJsonPackage)
     get_json_element("${object}" raw_patches patches "")
 
     # okay here comes the fun part: REPLACEMENTS!
-    # first: tag gets %VERSION% replaced if applicable,
-    #   with either git_version (preferred) or version
-    # second: artifact gets %VERSION% and %TAG% replaced
-    #   accordingly (same rules for VERSION)
+    # first: tag gets %VERSION% replaced if applicable, with either git_version (preferred) or version
+    # second: artifact gets %VERSION% and %TAG% replaced accordingly (same rules for VERSION)
 
     if(git_version)
         set(version_replace ${git_version})
@@ -192,11 +179,9 @@ function(AddJsonPackage)
         foreach(IDX RANGE ${range})
             string(JSON _patch GET "${raw_patches}" "${IDX}")
 
-            set(full_patch
-                "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
+            set(full_patch "${CMAKE_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
             if(NOT EXISTS ${full_patch})
-                cpm_utils_message(FATAL_ERROR ${JSON_NAME}
-                    "specifies patch ${full_patch} which does not exist")
+                cpm_utils_message(FATAL_ERROR ${JSON_NAME} "specifies patch ${full_patch} which does not exist")
             endif()
 
             list(APPEND patches "${full_patch}")
@@ -238,7 +223,8 @@ function(AddJsonPackage)
         GIT_HOST ${git_host}
 
         ARTIFACT ${artifact}
-        TAG ${tag})
+        TAG ${tag}
+    )
 
     # pass stuff to parent scope
     set(${package}_ADDED "${${package}_ADDED}"
@@ -294,7 +280,8 @@ function(AddPackage)
         KEY
         BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE
-        FIND_PACKAGE_ARGUMENTS)
+        FIND_PACKAGE_ARGUMENTS
+    )
 
     set(multiValueArgs OPTIONS PATCHES)
 
@@ -305,17 +292,8 @@ function(AddPackage)
         cpm_utils_message(FATAL_ERROR "package" "No package name defined")
     endif()
 
-    set(${PKG_ARGS_NAME}_CUSTOM_DIR "" CACHE STRING
-        "Path to a separately-downloaded copy of ${PKG_ARGS_NAME}")
-    option(${PKG_ARGS_NAME}_FORCE_SYSTEM
-        "Force the system package for ${PKG_ARGS_NAME}")
-    option(${PKG_ARGS_NAME}_FORCE_BUNDLED
-        "Force the bundled package for ${PKG_ARGS_NAME}")
-
-    if (DEFINED ${PKG_ARGS_NAME}_CUSTOM_DIR AND
-        NOT ${PKG_ARGS_NAME}_CUSTOM_DIR STREQUAL "")
-        set(CPM_${PKG_ARGS_NAME}_SOURCE ${${PKG_ARGS_NAME}_CUSTOM_DIR})
-    endif()
+    option(${PKG_ARGS_NAME}_FORCE_SYSTEM "Force the system package for ${PKG_ARGS_NAME}")
+    option(${PKG_ARGS_NAME}_FORCE_BUNDLED "Force the bundled package for ${PKG_ARGS_NAME}")
 
     if(NOT DEFINED PKG_ARGS_GIT_HOST)
         set(git_host github.com)
@@ -355,19 +333,17 @@ function(AddPackage)
                 set(PKG_BRANCH ${PKG_ARGS_BRANCH})
             else()
                 cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-                    "REPO defined but no TAG, SHA, BRANCH, or URL"
-                    "specified, defaulting to master")
+                    "REPO defined but no TAG, SHA, BRANCH, or URL specified, defaulting to master")
                 set(PKG_BRANCH master)
             endif()
 
             set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz)
         endif()
     else()
-        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-            "No URL or repository defined")
+        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME} "No URL or repository defined")
     endif()
 
-    cpm_utils_message(DEBUG ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
+    cpm_utils_message(STATUS ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
 
     if(NOT DEFINED PKG_ARGS_KEY)
         if(DEFINED PKG_ARGS_SHA)
@@ -426,8 +402,7 @@ function(AddPackage)
         # because "technically" the hash is invalidated each week
         # but it works for now kjsdnfkjdnfjksdn
         string(TOLOWER ${PKG_ARGS_NAME} lowername)
-        if(NOT EXISTS ${outfile} AND NOT EXISTS
-            ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
+        if(NOT EXISTS ${outfile} AND NOT EXISTS ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
             file(DOWNLOAD ${hash_url} ${outfile})
         endif()
 
@@ -453,7 +428,7 @@ function(AddPackage)
         - CPMUTIL_FORCE_BUNDLED
         - BUNDLED_PACKAGE
         - default to allow local
-    ]]
+    ]]    #
     if(PKG_ARGS_FORCE_BUNDLED_PACKAGE)
         set_precedence(OFF OFF)
     elseif(${PKG_ARGS_NAME}_FORCE_SYSTEM)
@@ -464,8 +439,7 @@ function(AddPackage)
         set_precedence(ON ON)
     elseif(CPMUTIL_FORCE_BUNDLED)
         set_precedence(OFF OFF)
-    elseif(DEFINED PKG_ARGS_BUNDLED_PACKAGE AND
-        NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")
+    elseif(DEFINED PKG_ARGS_BUNDLED_PACKAGE AND NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")
         if(PKG_ARGS_BUNDLED_PACKAGE)
             set(local OFF)
         else()
@@ -479,7 +453,8 @@ function(AddPackage)
 
     if(DEFINED PKG_ARGS_VERSION)
         list(APPEND EXTRA_ARGS
-            VERSION ${PKG_ARGS_VERSION})
+            VERSION ${PKG_ARGS_VERSION}
+        )
     endif()
 
     CPMAddPackage(
@@ -496,7 +471,8 @@ function(AddPackage)
 
         ${EXTRA_ARGS}
 
-        ${PKG_ARGS_UNPARSED_ARGUMENTS})
+        ${PKG_ARGS_UNPARSED_ARGUMENTS}
+    )
 
     set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_NAMES ${PKG_ARGS_NAME})
     set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_URLS ${pkg_git_url})
@@ -540,6 +516,24 @@ function(AddPackage)
 
 endfunction()
 
+function(add_ci_package key)
+    set(ARTIFACT ${ARTIFACT_NAME}-${key}-${ARTIFACT_VERSION}.${ARTIFACT_EXT})
+
+    AddPackage(
+        NAME ${ARTIFACT_PACKAGE}
+        REPO ${ARTIFACT_REPO}
+        TAG v${ARTIFACT_VERSION}
+        GIT_VERSION ${ARTIFACT_VERSION}
+        ARTIFACT ${ARTIFACT}
+
+        KEY ${key}-${ARTIFACT_VERSION}
+        HASH_SUFFIX sha512sum
+        FORCE_BUNDLED_PACKAGE ON
+    )
+
+    set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}_SOURCE_DIR} PARENT_SCOPE)
+endfunction()
+
 # TODO(crueter): we could do an AddMultiArchPackage, multiplatformpackage?
 # name is the artifact name, package is for find_package override
 function(AddCIPackage)
@@ -549,17 +543,12 @@ function(AddCIPackage)
         REPO
         PACKAGE
         EXTENSION
-        MIN_VERSION)
+        MIN_VERSION
+    )
 
     set(multiValueArgs DISABLED_PLATFORMS)
 
-    set(optionArgs MODULE)
-
-    cmake_parse_arguments(PKG_ARGS
-        "${optionArgs}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
-        ${ARGN})
+    cmake_parse_arguments(PKG_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     if(NOT DEFINED PKG_ARGS_VERSION)
         message(FATAL_ERROR "[CPMUtil] VERSION is required")
@@ -600,74 +589,55 @@ function(AddCIPackage)
     set(ARTIFACT_REPO ${PKG_ARGS_REPO})
     set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE})
 
-    if(MSVC AND ARCHITECTURE_x86_64)
-        set(pkgname windows-amd64)
-    elseif(MSVC AND ARCHITECTURE_arm64)
-        set(pkgname windows-arm64)
-    elseif(MINGW AND ARCHITECTURE_x86_64)
-        set(pkgname mingw-amd64)
-    elseif(MINGW AND ARCHITECTURE_arm64)
-        set(pkgname mingw-arm64)
-    elseif(ANDROID AND ARCHITECTURE_x86_64)
-        set(pkgname android-x86_64)
-    elseif(ANDROID AND ARCHITECTURE_arm64)
-        set(pkgname android-aarch64)
-    elseif(PLATFORM_SUN)
-        set(pkgname solaris-amd64)
-    elseif(PLATFORM_FREEBSD)
-        set(pkgname freebsd-amd64)
-    elseif(PLATFORM_LINUX AND ARCHITECTURE_x86_64)
-        set(pkgname linux-amd64)
-    elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64)
-        set(pkgname linux-aarch64)
-    elseif(APPLE)
-        set(pkgname macos-universal)
+    if((MSVC AND ARCHITECTURE_x86_64) AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(windows-amd64)
     endif()
 
-    if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
-        set(ARTIFACT "${ARTIFACT_NAME}-${pkgname}-${ARTIFACT_VERSION}.${ARTIFACT_EXT}")
+    if((MSVC AND ARCHITECTURE_arm64) AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(windows-arm64)
+    endif()
 
-        AddPackage(
-            NAME ${ARTIFACT_PACKAGE}
-            REPO ${ARTIFACT_REPO}
-            TAG "v${ARTIFACT_VERSION}"
-            GIT_VERSION ${ARTIFACT_VERSION}
-            ARTIFACT ${ARTIFACT}
+    if((MINGW AND ARCHITECTURE_x86_64) AND NOT "mingw-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(mingw-amd64)
+    endif()
 
-            KEY "${pkgname}-${ARTIFACT_VERSION}"
-            HASH_SUFFIX sha512sum
-            FORCE_BUNDLED_PACKAGE ON
-            DOWNLOAD_ONLY ${PKG_ARGS_MODULE})
+    if((MINGW AND ARCHITECTURE_arm64) AND NOT "mingw-arm64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(mingw-arm64)
+    endif()
 
+    if((ANDROID AND ARCHITECTURE_x86_64) AND NOT "android-x86_64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(android-x86_64)
+    endif()
+
+    if((ANDROID AND ARCHITECTURE_arm64) AND NOT "android-aarch64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(android-aarch64)
+    endif()
+
+    if(PLATFORM_SUN AND NOT "solaris-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(solaris-amd64)
+    endif()
+
+    if(PLATFORM_FREEBSD AND NOT "freebsd-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(freebsd-amd64)
+    endif()
+
+    if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) AND NOT "linux-amd64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux-amd64)
+    endif()
+
+    if((PLATFORM_LINUX AND ARCHITECTURE_arm64) AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(linux-aarch64)
+    endif()
+
+    # TODO(crueter): macOS amd64/aarch64 split mayhaps
+    if(APPLE AND NOT "macos-universal" IN_LIST DISABLED_PLATFORMS)
+        add_ci_package(macos-universal)
+    endif()
+
+    if(DEFINED ARTIFACT_DIR)
         set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE)
-        set(${ARTIFACT_PACKAGE}_SOURCE_DIR
-            "${${ARTIFACT_PACKAGE}_SOURCE_DIR}" PARENT_SCOPE)
-
-        if (PKG_ARGS_MODULE)
-            list(APPEND CMAKE_PREFIX_PATH "${${ARTIFACT_PACKAGE}_SOURCE_DIR}")
-            set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-        endif()
+        set(${ARTIFACT_PACKAGE}_SOURCE_DIR "${ARTIFACT_DIR}" PARENT_SCOPE)
     else()
         find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED)
     endif()
 endfunction()
-
-# Utility function for Qt
-function(AddQt version)
-    if (NOT DEFINED version)
-        message(FATAL_ERROR "[CPMUtil] AddQt: version is required")
-    endif()
-
-    AddCIPackage(
-        NAME Qt
-        PACKAGE Qt6
-        VERSION ${version}
-        MIN_VERSION 6
-        REPO crueter-ci/Qt
-        DISABLED_PLATFORMS
-            android-x86_64 android-aarch64
-            freebsd-amd64 solaris-amd64 openbsd-amd64
-        MODULE)
-
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-endfunction()

CMakeModules/CopyYuzuQt6Deps.cmake

@@ -0,0 +1,66 @@
+# SPDX-FileCopyrightText: 2024 kleidis
+
+function(copy_yuzu_Qt6_deps target_dir)
+    include(WindowsCopyFiles)
+    if (MSVC)
+        set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/")
+        set(Qt6_DLL_DIR "${Qt6_DIR}/../../../bin")
+    else()
+        set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/")
+        set(Qt6_DLL_DIR "${Qt6_DIR}/../../../lib/")
+    endif()
+    set(Qt6_PLATFORMS_DIR "${Qt6_DIR}/../../../plugins/platforms/")
+    set(Qt6_STYLES_DIR "${Qt6_DIR}/../../../plugins/styles/")
+    set(Qt6_IMAGEFORMATS_DIR "${Qt6_DIR}/../../../plugins/imageformats/")
+    set(Qt6_RESOURCES_DIR "${Qt6_DIR}/../../../resources/")
+    set(PLATFORMS ${DLL_DEST}plugins/platforms/)
+    set(STYLES ${DLL_DEST}plugins/styles/)
+    set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/)
+	set(RESOURCES ${DLL_DEST}resources/)
+    if (MSVC)
+        windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
+            Qt6Core$<$<CONFIG:Debug>:d>.*
+            Qt6Gui$<$<CONFIG:Debug>:d>.*
+            Qt6Widgets$<$<CONFIG:Debug>:d>.*
+            Qt6Network$<$<CONFIG:Debug>:d>.*
+        )
+        if (YUZU_USE_QT_MULTIMEDIA)
+            windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
+                Qt6Multimedia$<$<CONFIG:Debug>:d>.*
+            )
+        endif()
+        if (YUZU_USE_QT_WEB_ENGINE)
+            windows_copy_files(${target_dir} ${Qt6_DLL_DIR} ${DLL_DEST}
+                Qt6OpenGL$<$<CONFIG:Debug>:d>.*
+                Qt6Positioning$<$<CONFIG:Debug>:d>.*
+                Qt6PrintSupport$<$<CONFIG:Debug>:d>.*
+                Qt6Qml$<$<CONFIG:Debug>:d>.*
+				Qt6QmlMeta$<$<CONFIG:Debug>:d>.*
+                Qt6QmlModels$<$<CONFIG:Debug>:d>.*
+				Qt6QmlWorkerScript$<$<CONFIG:Debug>:d>.*
+                Qt6Quick$<$<CONFIG:Debug>:d>.*
+                Qt6QuickWidgets$<$<CONFIG:Debug>:d>.*
+                Qt6WebChannel$<$<CONFIG:Debug>:d>.*
+                Qt6WebEngineCore$<$<CONFIG:Debug>:d>.*
+                Qt6WebEngineWidgets$<$<CONFIG:Debug>:d>.*
+				QtWebEngineProcess$<$<CONFIG:Debug>:d>.*
+            )
+            windows_copy_files(${target_dir} ${Qt6_RESOURCES_DIR} ${RESOURCES}
+                icudtl.dat
+                qtwebengine_devtools_resources.pak
+                qtwebengine_resources.pak
+                qtwebengine_resources_100p.pak
+                qtwebengine_resources_200p.pak
+				v8_context_snapshot.bin
+            )
+        endif()
+        windows_copy_files(yuzu ${Qt6_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*)
+        windows_copy_files(yuzu ${Qt6_STYLES_DIR} ${STYLES} qmodernwindowsstyle$<$<CONFIG:Debug>:d>.*)
+        windows_copy_files(yuzu ${Qt6_IMAGEFORMATS_DIR} ${IMAGEFORMATS}
+            qjpeg$<$<CONFIG:Debug>:d>.*
+            qgif$<$<CONFIG:Debug>:d>.*
+        )
+    else()
+        # Update for non-MSVC platforms if needed
+    endif()
+endfunction(copy_yuzu_Qt6_deps)

CMakeModules/DownloadExternals.cmake

@@ -0,0 +1,271 @@
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This function downloads a binary library package from our external repo.
+# Params:
+#   remote_path: path to the file to download, relative to the remote repository root
+#   prefix_var: name of a variable which will be set with the path to the extracted contents
+set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
+function(download_bundled_external remote_path lib_name cpm_key prefix_var version)
+    set(package_base_url "https://github.com/eden-emulator/")
+    set(package_repo "no_platform")
+    set(package_extension "no_platform")
+    set(CACHE_KEY "")
+
+    # TODO(crueter): Need to convert ffmpeg to a CI.
+    if (WIN32 OR FORCE_WIN_ARCHIVES)
+        if (ARCHITECTURE_arm64)
+            set(CACHE_KEY "windows")
+            set(package_repo "ext-windows-arm64-bin/raw/master/")
+            set(package_extension ".zip")
+        elseif(ARCHITECTURE_x86_64)
+            set(CACHE_KEY "windows")
+            set(package_repo "ext-windows-bin/raw/master/")
+            set(package_extension ".7z")
+        endif()
+    elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+        set(CACHE_KEY "linux")
+        set(package_repo "ext-linux-bin/raw/master/")
+        set(package_extension ".tar.xz")
+    elseif (ANDROID)
+        set(CACHE_KEY "android")
+        set(package_repo "ext-android-bin/raw/master/")
+        set(package_extension ".tar.xz")
+    else()
+        message(FATAL_ERROR "No package available for this platform")
+    endif()
+    string(CONCAT package_url "${package_base_url}" "${package_repo}")
+    string(CONCAT full_url "${package_url}" "${remote_path}" "${lib_name}" "${package_extension}")
+    message(STATUS "Resolved bundled URL: ${full_url}")
+
+    # TODO(crueter): DELETE THIS ENTIRELY, GLORY BE TO THE CI!
+    AddPackage(
+        NAME ${cpm_key}
+        VERSION ${version}
+        URL ${full_url}
+        DOWNLOAD_ONLY YES
+        KEY ${CACHE_KEY}
+        BUNDLED_PACKAGE ON
+        # TODO(crueter): hash
+    )
+
+    if (DEFINED ${cpm_key}_SOURCE_DIR)
+        set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)
+        message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")
+    else()
+        message(FATAL_ERROR "AddPackage did not set ${cpm_key}_SOURCE_DIR")
+    endif()
+endfunction()
+
+# Determine installation parameters for OS, architecture, and compiler
+function(determine_qt_parameters target host_out type_out arch_out arch_path_out host_type_out host_arch_out host_arch_path_out)
+    if (WIN32)
+        set(host "windows")
+        set(type "desktop")
+
+        if (NOT tool)
+            if (MINGW)
+                set(arch "win64_mingw")
+                set(arch_path "mingw_64")
+            elseif (MSVC)
+                if ("arm64" IN_LIST ARCHITECTURE)
+                    set(arch_path "msvc2022_arm64")
+                elseif ("x86_64" IN_LIST ARCHITECTURE)
+                    set(arch_path "msvc2022_64")
+                else()
+                    message(FATAL_ERROR "Unsupported bundled Qt architecture. Disable YUZU_USE_BUNDLED_QT and provide your own.")
+                endif()
+                set(arch "win64_${arch_path}")
+
+                if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64")
+                    set(host_arch_path "msvc2022_64")
+                elseif (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
+                    set(host_arch_path "msvc2022_arm64")
+                endif()
+                set(host_arch "win64_${host_arch_path}")
+            else()
+                message(FATAL_ERROR "Unsupported bundled Qt toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
+            endif()
+        endif()
+    elseif (APPLE)
+        set(host "mac")
+        set(type "desktop")
+        set(arch "clang_64")
+        set(arch_path "macos")
+    else()
+        set(host "linux")
+        set(type "desktop")
+        set(arch "linux_gcc_64")
+        set(arch_path "gcc_64")
+    endif()
+
+    set(${host_out} "${host}" PARENT_SCOPE)
+    set(${type_out} "${type}" PARENT_SCOPE)
+    set(${arch_out} "${arch}" PARENT_SCOPE)
+    set(${arch_path_out} "${arch_path}" PARENT_SCOPE)
+    if (DEFINED host_type)
+        set(${host_type_out} "${host_type}" PARENT_SCOPE)
+    else()
+        set(${host_type_out} "${type}" PARENT_SCOPE)
+    endif()
+    if (DEFINED host_arch)
+        set(${host_arch_out} "${host_arch}" PARENT_SCOPE)
+    else()
+        set(${host_arch_out} "${arch}" PARENT_SCOPE)
+    endif()
+    if (DEFINED host_arch_path)
+        set(${host_arch_path_out} "${host_arch_path}" PARENT_SCOPE)
+    else()
+        set(${host_arch_path_out} "${arch_path}" PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Download Qt binaries for a specific configuration.
+function(download_qt_configuration prefix_out target host type arch arch_path base_path)
+    if (target MATCHES "tools_.*")
+        set(tool ON)
+    else()
+        set(tool OFF)
+    endif()
+
+    set(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")
+    if (tool)
+        set(prefix "${base_path}/Tools")
+        list(APPEND install_args install-tool --outputdir "${base_path}" "${host}" desktop "${target}")
+    else()
+        set(prefix "${base_path}/${target}/${arch_path}")
+        list(APPEND install_args install-qt --outputdir "${base_path}" "${host}" "${type}" "${target}" "${arch}" -m qt_base)
+
+        if (YUZU_USE_QT_MULTIMEDIA)
+            list(APPEND install_args qtmultimedia)
+        endif()
+
+        if (YUZU_USE_QT_WEB_ENGINE)
+            list(APPEND install_args qtpositioning qtwebchannel qtwebengine)
+        endif()
+
+        if (NOT "${YUZU_QT_MIRROR}" STREQUAL "")
+            message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}")
+            list(APPEND install_args -b "${YUZU_QT_MIRROR}")
+        endif()
+    endif()
+
+    message(STATUS "Install Args: ${install_args}")
+
+    if (NOT EXISTS "${prefix}")
+        message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")
+        set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")
+        if (WIN32)
+            set(aqt_path "${base_path}/aqt.exe")
+            if (NOT EXISTS "${aqt_path}")
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt.exe" "${aqt_path}" SHOW_PROGRESS)
+            endif()
+            execute_process(COMMAND "${aqt_path}" ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                OUTPUT_VARIABLE aqt_out
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt.exe failed: ${aqt_err}")
+            endif()
+        elseif (APPLE)
+            set(aqt_path "${base_path}/aqt-macos")
+            if (NOT EXISTS "${aqt_path}")
+                file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt-macos" "${aqt_path}" SHOW_PROGRESS)
+            endif()
+            execute_process(COMMAND chmod +x "${aqt_path}")
+            execute_process(COMMAND "${aqt_path}" ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt-macos failed: ${aqt_err}")
+            endif()
+        else()
+            find_program(PYTHON3_EXECUTABLE python3)
+            if (NOT PYTHON3_EXECUTABLE)
+                message(FATAL_ERROR "python3 is required to install Qt using aqt (pip mode).")
+            endif()
+            set(aqt_install_path "${base_path}/aqt")
+            file(MAKE_DIRECTORY "${aqt_install_path}")
+
+            execute_process(COMMAND "${PYTHON3_EXECUTABLE}" -m pip install --target="${aqt_install_path}" aqtinstall
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE pip_res
+                ERROR_VARIABLE pip_err)
+            if (NOT pip_res EQUAL 0)
+                message(FATAL_ERROR "pip install aqtinstall failed: ${pip_err}")
+            endif()
+
+            execute_process(COMMAND "${CMAKE_COMMAND}" -E env PYTHONPATH="${aqt_install_path}" "${PYTHON3_EXECUTABLE}" -m aqt ${install_args}
+                WORKING_DIRECTORY "${base_path}"
+                RESULT_VARIABLE aqt_res
+                ERROR_VARIABLE aqt_err)
+            if (NOT aqt_res EQUAL 0)
+                message(FATAL_ERROR "aqt (python) failed: ${aqt_err}")
+            endif()
+        endif()
+
+        message(STATUS "Downloaded Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path} to ${prefix}")
+    endif()
+
+    set(${prefix_out} "${prefix}" PARENT_SCOPE)
+endfunction()
+
+# This function downloads Qt using aqt.
+# The path of the downloaded content will be added to the CMAKE_PREFIX_PATH.
+# QT_TARGET_PATH is set to the Qt for the compile target platform.
+# QT_HOST_PATH is set to a host-compatible Qt, for running tools.
+# Params:
+#   target: Qt dependency to install. Specify a version number to download Qt, or "tools_(name)" for a specific build tool.
+function(download_qt target)
+    determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_path)
+
+    set(base_path "${CMAKE_BINARY_DIR}/externals/qt")
+    file(MAKE_DIRECTORY "${base_path}")
+
+    download_qt_configuration(prefix "${target}" "${host}" "${type}" "${arch}" "${arch_path}" "${base_path}")
+    if (DEFINED host_arch_path AND NOT "${host_arch_path}" STREQUAL "${arch_path}")
+        download_qt_configuration(host_prefix "${target}" "${host}" "${host_type}" "${host_arch}" "${host_arch_path}" "${base_path}")
+    else()
+        set(host_prefix "${prefix}")
+    endif()
+
+    set(QT_TARGET_PATH "${prefix}" CACHE STRING "")
+    set(QT_HOST_PATH "${host_prefix}" CACHE STRING "")
+
+    list(APPEND CMAKE_PREFIX_PATH "${prefix}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+endfunction()
+
+function(download_moltenvk version platform)
+    if(NOT version)
+        message(FATAL_ERROR "download_moltenvk: version argument is required")
+    endif()
+    if(NOT platform)
+        message(FATAL_ERROR "download_moltenvk: platform argument is required")
+    endif()
+
+    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"
+            RESULT_VARIABLE tar_res
+            ERROR_VARIABLE tar_err
+        )
+        if(NOT tar_res EQUAL 0)
+            message(FATAL_ERROR "Extracting MoltenVK failed: ${tar_err}")
+        endif()
+    endif()
+    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+endfunction()
+

CMakeModules/Findzstd.cmake

@@ -14,7 +14,8 @@ else()
     pkg_search_module(ZSTD QUIET IMPORTED_TARGET libzstd)
     find_package_handle_standard_args(zstd
         REQUIRED_VARS ZSTD_LINK_LIBRARIES
-        VERSION_VAR ZSTD_VERSION)
+        VERSION_VAR ZSTD_VERSION
+    )
 endif()
 
 if (zstd_FOUND AND NOT TARGET zstd::zstd)
@@ -35,7 +36,4 @@ if (NOT TARGET zstd::libzstd)
     else()
         add_library(zstd::libzstd ALIAS zstd::zstd)
     endif()
-elseif(YUZU_STATIC_BUILD AND TARGET zstd::libzstd_static)
-    # zstd::libzstd links to shared zstd by default
-    set_target_properties(zstd::libzstd PROPERTIES INTERFACE_LINK_LIBRARIES zstd::libzstd_static)
 endif()

CMakeModules/StaticQtLibs.cmake

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+## When linking to a static Qt build on MinGW, certain additional libraries
+## must be statically linked to as well.
+
+function(static_qt_link target)
+    macro(extra_libs)
+        foreach(lib ${ARGN})
+            find_library(${lib}_LIBRARY ${lib} REQUIRED)
+            target_link_libraries(${target} PRIVATE ${${lib}_LIBRARY})
+        endforeach()
+    endmacro()
+
+    # I am constantly impressed at how ridiculously stupid the linker is
+    # NB: yes, we have to put them here twice. I have no idea why
+
+    # libtiff.a
+    extra_libs(tiff jbig bz2 lzma deflate jpeg tiff)
+
+    # libfreetype.a
+    extra_libs(freetype bz2 Lerc brotlidec brotlicommon freetype)
+
+    # libharfbuzz.a
+    extra_libs(harfbuzz graphite2)
+
+    # sijfjkfnjkdfjsbjsbsdfhvbdf
+    if (ENABLE_OPENSSL)
+        target_link_libraries(${target} PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+    endif()
+endfunction()

README.md

@@ -15,8 +15,8 @@
   <br>
 </h1>
 
-<h4 align="center"><b>Eden</b> is a free and opensource (FOSS) Switch 1 emulator, derived from Yuzu and Sudachi - started by developer Camille LaVey.
-It's written in C++ with portability in mind, with builds for Windows, Linux, macOS, Android, FreeBSD and more.
+<h4 align="center"><b>Eden</b> is an open-source Nintendo Switch emulator, forked from the Yuzu emulator — started by former Citron developer Camille LaVey and the Eden team.
+It is written in C++ with portability in mind, and we actively maintain builds for Windows, Linux and Android.
 </h4>
 
 <p align="center">

cpmfile.json

@@ -4,7 +4,7 @@
         "package": "OpenSSL",
         "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "3.6.0-1cb0d36b39",
+        "version": "3.6.0-965d6279e8",
         "min_version": "1.1.1"
     },
     "boost": {

dist/dev.eden_emu.eden.desktop

@@ -9,7 +9,7 @@ Version=1.0
 Type=Application
 Name=Eden
 GenericName=Switch Emulator
-Comment=Multiplatform FOSS Switch 1 emulator written in C++, derived from Yuzu and Sudachi
+Comment=Nintendo Switch video game console emulator
 Icon=dev.eden_emu.eden
 TryExec=eden
 Exec=eden %f

dist/dev.eden_emu.eden.metainfo.xml

@@ -16,7 +16,7 @@ SPDX-License-Identifier: CC0-1.0
   <name>eden</name>
   <summary>Nintendo Switch emulator</summary>
   <description>
-    <p>Multiplatform FOSS Switch 1 emulator written in C++, derived from Yuzu and Sudachi</p>
+    <p>Nintendo Switch video game console emulator</p>
   </description>
   <categories>
     <category>Game</category>

dist/dev.eden_emu.eden.svg

@@ -6,197 +6,141 @@
    viewBox="0 0 512 512"
    version="1.1"
    id="svg7"
-   sodipodi:docname="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:version="1.4.2 (ebf0e94, 2025-05-08)"
-   inkscape:export-filename="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
+   sodipodi:docname="newyear2025.svg"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
+   xml:space="preserve"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <metadata>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#">
+      <cc:Work rdf:about="">
+        <dc:title>New Year 2025 Logo</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Madeline_Dev</dc:title>
+            <dc:identifier>mailto:madelvidel@gmail.com</dc:identifier>
+          </cc:Agent>
+        </dc:creator>
+        <dc:date>2025</dc:date>
+        <dc:license rdf:resource="https://www.gnu.org/licenses/gpl-3.0.html"/>
+        <dc:rights>2025 Eden Emulator Project</dc:rights>
+        <dc:source>https://git.eden-emu.dev</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
-     id="defs7">
-    <linearGradient
+     id="defs7"><linearGradient
+       id="swatch14"
+       inkscape:swatch="solid"><stop
+         style="stop-color:#66003b;stop-opacity:1;"
+         offset="0"
+         id="stop14" /></linearGradient><linearGradient
        id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:0.5;"
+       inkscape:collect="always"><stop
+         style="stop-color:#670047;stop-opacity:1;"
          offset="0"
-         id="stop3" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:0.5;"
-         offset="0.44631511"
-         id="stop4" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:0.5;"
-         offset="0.90088946"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient138"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
-         offset="0"
-         id="stop152" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop137" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="swatch37"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37" />
-    </linearGradient>
-    <linearGradient
-       id="swatch28"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#252525;stop-opacity:1;"
-         offset="0"
-         id="stop28" />
-    </linearGradient>
-    <linearGradient
-       id="swatch27"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop27" />
-    </linearGradient>
-    <linearGradient
-       id="swatch15"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop16" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14"
-       inkscape:swatch="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop14" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop1" /><stop
+         style="stop-color:#54003b;stop-opacity:0;"
          offset="1"
-         id="stop15" />
-    </linearGradient>
-    <linearGradient
-       id="swatch9"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop10" />
-    </linearGradient>
-    <linearGradient
-       id="swatch8"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9" />
-    </linearGradient>
-    <rect
-       x="22.627417"
-       y="402.76802"
-       width="521.34025"
-       height="248.94868"
-       id="rect24" />
-    <linearGradient
+         id="stop2" /></linearGradient><linearGradient
        id="linearGradient11"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
+       inkscape:collect="always"><stop
+         style="stop-color:#60001d;stop-opacity:1;"
          offset="0"
-         id="stop11" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop154" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop12" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.118028,0,0,1.116699,-46.314723,-42.388667)"
-       x1="270.39996"
-       y1="40.000019"
-       x2="270.39996"
-       y2="494.39996"
-       spreadMethod="pad" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath18">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle18"
-         cx="-246.8315"
-         cy="246.8338"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath22">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle22"
-         cx="256"
-         cy="256"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <linearGradient
+         id="stop11" /><stop
+         style="stop-color:#2f087e;stop-opacity:1;"
+         offset="0.49822688"
+         id="stop20" /><stop
+         style="stop-color:#0d3969;stop-opacity:1;"
+         offset="0.99898213"
+         id="stop12" /></linearGradient><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient11"
-       id="linearGradient27"
+       id="linearGradient12"
+       x1="109.74531"
+       y1="106.54533"
+       x2="431.05463"
+       y2="427.85461"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.9401139e-5,-2.8678628)"
-       x1="256.00012"
-       y1="102.94693"
-       x2="256.00012"
-       y2="409.05307" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath128">
-      <circle
-         style="fill:none;fill-opacity:1;stroke:#03ffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-         id="circle128"
-         cx="256"
-         cy="256"
-         r="192" />
-    </clipPath>
-    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="translate(-14.100045,-9.900077)" /><linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1"
        id="linearGradient2"
-       x1="256"
-       y1="64"
-       x2="256"
-       y2="448"
+       x1="125.40197"
+       y1="271.834"
+       x2="431.02424"
+       y2="271.834"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3229974,0,0,1.3214002,-82.687336,-82.290326)" />
-  </defs>
-  <sodipodi:namedview
+       gradientTransform="matrix(1.0017288,0,0,0.93676627,-14.581021,3.8948884)" /><filter
+       inkscape:label="Light Contour"
+       inkscape:menu="Image Paint and Draw"
+       inkscape:menu-tooltip="Uses vertical specular light to draw lines"
+       style="color-interpolation-filters:sRGB"
+       id="filter11"
+       x="-0.01907517"
+       y="-0.054959154"
+       width="1.0379885"
+       height="1.1092314"><feGaussianBlur
+         in="SourceGraphic"
+         stdDeviation="0.38250006"
+         result="result3"
+         id="feGaussianBlur9" /><feComponentTransfer
+         result="result1"
+         in="result3"
+         id="feComponentTransfer9"><feFuncR
+           type="discrete"
+           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
+           id="feFuncR9" /><feFuncG
+           type="discrete"
+           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
+           id="feFuncG9" /><feFuncB
+           type="discrete"
+           tableValues="0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1"
+           id="feFuncB9" /></feComponentTransfer><feGaussianBlur
+         result="result5"
+         stdDeviation="0.01"
+         id="feGaussianBlur10" /><feBlend
+         in2="result5"
+         result="result6"
+         mode="lighten"
+         in="result5"
+         id="feBlend10" /><feColorMatrix
+         in="result6"
+         type="luminanceToAlpha"
+         result="result2"
+         id="feColorMatrix10" /><feSpecularLighting
+         surfaceScale="5"
+         result="result9"
+         specularExponent="20"
+         in="result2"
+         specularConstant="1"
+         id="feSpecularLighting10"><feDistantLight
+           azimuth="180"
+           elevation="90"
+           id="feDistantLight10" /></feSpecularLighting><feComposite
+         in2="result6"
+         operator="arithmetic"
+         in="result9"
+         k1="0.4"
+         k3="0.7"
+         result="result3"
+         id="feComposite10"
+         k2="0"
+         k4="0" /><feBlend
+         in2="result1"
+         in="result3"
+         mode="normal"
+         result="result8"
+         id="feBlend11" /><feComposite
+         in2="SourceGraphic"
+         in="result8"
+         operator="in"
+         result="result7"
+         id="feComposite11" /></filter></defs><sodipodi:namedview
      id="namedview7"
      pagecolor="#ffffff"
      bordercolor="#000000"
@@ -205,26 +149,524 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="261.62951"
-     inkscape:cy="230.87036"
+     inkscape:zoom="1.2"
+     inkscape:cx="255.83333"
+     inkscape:cy="263.75"
      inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="1080"
-     inkscape:window-y="351"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
-  <path
-     id="path8-7"
-     style="display:inline;mix-blend-mode:multiply;fill:url(#linearGradient6);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2);stroke-width:3.9666;stroke-dasharray:none;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     inkscape:label="Circle"
-     d="M 256,2.2792898 A 254.0155,253.71401 0 0 0 150.68475,25.115202 c 19.54414,1.070775 38.74692,5.250294 51.56848,11.647658 14.14361,7.056691 28.63804,19.185961 39.4212,29.347551 h 40.60981 c 1.03847,-0.68139 2.10297,-1.36938 3.1938,-2.05957 5.45602,-15.78533 14.79164,-43.183497 19.49612,-57.0097682 A 254.0155,253.71401 0 0 0 256,2.2792898 Z m 61.57106,7.567234 -18.26098,46.1544672 c 7.79702,-4.13918 16.35655,-7.87447 25.20671,-10.87081 23.1229,-7.828433 43.96931,-10.170904 54.94058,-10.868226 A 254.0155,253.71401 0 0 0 317.57106,9.8465238 Z m 65.39277,26.4001532 c -9.68256,4.806644 -33.05532,16.642034 -55.68217,29.863734 H 424.4677 A 254.0155,253.71401 0 0 0 382.96383,36.246677 Z M 113.90698,45.690231 A 254.0155,253.71401 0 0 0 87.532302,66.110411 H 194.2739 c -1.47402,-0.80231 -2.35141,-1.25949 -2.35141,-1.25949 l 10.4496,-11.83348 -38.40568,7.01234 c 0,1e-5 -12.21537,-4.60266 -40.17313,-12.27223 -3.45336,-0.94731 -6.75329,-1.61824 -9.8863,-2.06732 z m -36.803618,30.18635 a 254.0155,253.71401 0 0 0 -34.88372,43.090929 h 59.976738 c 18.11461,-12.04145 40.14252,-22.882149 62.31266,-24.534159 52.93006,-3.9444 70.16538,1.86342 70.16538,1.86342 0,0 -4.612,-4.8206 -14.51938,-13.36656 -2.72366,-2.34942 -6.0844,-4.77373 -9.52455,-7.05363 z m 174.472868,0 c 4.57322,4.7186 7.29716,7.83565 7.29716,7.83565 0,0 3.53501,-3.18484 9.62532,-7.83565 z m 60.27649,0 c -21.56573,15.45339 -25.4703,27.979669 -25.4703,27.979669 0,0 54.83326,-19.215729 100.70543,-0.31228 11.63986,4.79661 21.58481,10.13159 29.94832,15.42354 h 52.74419 A 254.0155,253.71401 0 0 0 434.89664,75.876581 Z M 36.250648,128.73367 A 254.0155,253.71401 0 0 0 16.372095,171.82459 H 147.45478 c 1.45695,-2.5815 3.06539,-5.08648 4.83979,-7.48982 14.23694,-19.28301 27.92088,-30.0088 36.86047,-35.6011 h -30.25323 c -5.87346,0.93472 -12.04945,1.99094 -18.28166,3.16937 -30.12936,5.69727 -81.157618,22.78945 -81.157618,22.78945 0,0 11.47125,-12.39249 29.11369,-25.95882 z m 265.630492,0 c 33.48676,11.2434 52.42799,26.78443 62.7752,43.09092 h 130.97157 a 254.0155,253.71401 0 0 0 -19.87856,-43.09092 h -44.81136 c 14.85233,11.5863 21.59948,20.9854 21.59948,20.9854 0,0 -33.5226,-12.37087 -66.0646,-20.9854 z m -45.96641,16.27007 c -1.00419,0.0106 -10.12705,0.72026 -44.98966,20.64729 -3.12132,1.78406 -6.25434,3.86182 -9.37468,6.17356 h 41.81911 c 7.17181,-17.34774 12.64083,-26.82085 12.64083,-26.82085 0,0 -0.0287,-7.1e-4 -0.0957,0 z m 14.18088,0.0465 c 0,0 -3.31228,9.32762 -7.30492,26.77438 h 51.78554 C 287.6577,146.14158 270.09561,145.0502 270.09561,145.0502 Z M 13.152456,181.59075 A 254.0155,253.71401 0 0 0 3.927651,224.68167 H 134.1447 c 0.56161,-12.72411 2.67825,-28.50188 8.61499,-43.09092 z m 176.661504,0 c -14.27121,13.10564 -27.60733,29.58761 -37.56073,43.09092 h 73.3721 c 4.47018,-16.79061 9.35068,-31.26371 13.86562,-43.09092 z m 70.85787,0 c -2.41384,11.76417 -4.9032,26.20707 -6.94831,43.09092 H 360.4832 c -8.32133,-10.88917 -20.66988,-26.17008 -36.35141,-43.09092 z m 109.17313,0 c 6.63611,15.24089 6.92441,30.5373 5.57882,43.09092 h 132.64857 a 254.0155,253.71401 0 0 0 -9.22481,-43.09092 z M 2.90181,234.44783 A 254.0155,253.71401 0 0 0 1.984498,255.9933 254.0155,253.71401 0 0 0 2.90181,277.53876 h 211.89923 c 2.25762,-15.52555 5.14325,-29.93448 8.3385,-43.09093 h -77.8863 c -6.46396,9.27617 -10.33076,15.56549 -10.33076,15.56549 0,0 -0.82623,-6.14945 -0.9354,-15.56549 z m 249.72093,0 c -1.3692,13.09684 -2.4456,27.49209 -3.02068,43.09093 h 259.49613 a 254.0155,253.71401 0 0 0 0.91731,-21.54546 254.0155,253.71401 0 0 0 -0.91731,-21.54547 H 374.02584 c -0.445,2.5469 -0.90878,4.89768 -1.32817,7.01751 0,0 -1.69726,-2.53821 -4.94056,-7.01751 z M 3.927651,287.30493 a 254.0155,253.71401 0 0 0 9.224805,43.09091 H 214.04393 c -1.29238,-15.40742 -1.57503,-30.04388 -0.41861,-43.09091 z m 245.385009,0 c -0.30355,13.54349 -0.22032,27.92598 0.36951,43.09091 h 249.16537 a 254.0155,253.71401 0 0 0 9.22481,-43.09091 z M 16.369511,340.16201 a 254.0155,253.71401 0 0 0 19.878554,43.09091 H 221.4677 c -2.69781,-14.4523 -4.96108,-29.01285 -6.4832,-43.09091 z m 233.842379,0 c 1.15864,15.47765 3.81286,29.83979 7.51679,43.09091 h 218.02325 a 254.0155,253.71401 0 0 0 19.87856,-43.09091 z M 42.217052,393.01909 a 254.0155,253.71401 0 0 0 34.88372,43.09093 H 233.09561 c -3.40902,-13.67281 -6.76794,-28.2531 -9.73902,-43.09093 z m 218.490958,0 c 5.34985,16.15926 12.22007,30.51982 19.68733,43.09093 h 154.50389 a 254.0155,253.71401 0 0 0 34.88371,-43.09093 z M 87.529722,445.87618 a 254.0155,253.71401 0 0 0 166.229968,63.8208 c -3.67805,-12.0825 -10.85464,-35.49828 -18.18088,-63.8208 z m 199.010328,0 c 17.5887,26.43772 36.99259,43.60598 47.33592,51.61309 a 254.0155,253.71401 0 0 0 90.59431,-51.61309 z" />
-  <path
-     id="path27"
-     style="display:inline;mix-blend-mode:multiply;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient27);stroke-width:3;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 318.98012,441.7375 c -9.87518,-6.73978 -64.39137,-49.0272 -67.68975,-127.81978 -3.69298,-88.21893 15.36468,-141.91029 15.36468,-141.91029 0,0 16.00378,0.99513 39.80316,26.53195 23.79939,25.53753 37.74965,46.43102 37.74965,46.43102 3.91262,-19.79992 12.84563,-66.32402 -60.72865,-87.55523 0,0 12.82326,-5.38883 39.3925,-3.81382 26.56907,1.57572 81.6822,21.93799 81.6822,21.93799 0,0 -14.79766,-20.63773 -49.47063,-34.94295 -34.67291,-14.30533 -76.1182,0.23644 -76.1182,0.23644 0,0 3.86959,-12.43127 27.22669,-26.38478 23.35718,-13.9537 49.27409,-26.501533 49.27409,-26.501533 0,0 -21.97854,-0.26548 -47.67725,8.44535 -6.68948,2.267506 -13.15863,5.094213 -19.05208,8.226563 l 16.05803,-40.634103 -4.4617,-1.89059 -5.1305,-0.95965 c 0,0 -11.24072,33.12428 -16.92051,49.576513 -12.13137,7.68489 -20.11005,14.87735 -20.11005,14.87735 0,0 -21.90573,-25.09227 -42.79668,-35.527803 -26.03412,-13.00525 -86.88249,-13.90359 -94.0044,10.401173 0,0 13.56804,-7.884703 34.70032,-2.080917 21.13214,5.803997 30.3644,9.287307 30.3644,9.287307 l 29.02989,-5.30681 -7.89811,8.95527 c 0,0 13.8496,7.21324 21.33822,13.68063 7.48859,6.46722 10.9757,10.11472 10.9757,10.11472 0,0 -13.02739,-4.39388 -53.03507,-1.40893 -40.00771,2.98473 -79.40016,45.60209 -79.40016,45.60209 0,0 38.57037,-12.93531 61.34393,-17.24677 22.77354,-4.31126 44.52166,-6.46757 44.52166,-6.46757 0,0 -17.23298,5.97003 -35.69792,31.00932 -18.46522,25.03987 -13.13146,64.83866 -13.13146,64.83866 0,0 29.33874,-47.7577 57.44675,-63.84249 28.10798,-16.08527 34.0799,-15.6238 34.0799,-15.6238 0,0 -22.56785,39.13486 -31.39017,101.98268 -8.03005,57.2039 26.77689,163.75449 31.1572,178.89699"
-     sodipodi:nodetypes="cscsccscscscsccccccscscccscscscscscsc"
-     inkscape:label="MainOutline"
-     clip-path="url(#clipPath128)"
-     transform="matrix(1.3229974,0,0,1.3214002,-82.687282,-82.278451)" />
-</svg>
+     inkscape:current-layer="svg7"
+     showguides="false" /><circle
+     style="fill:url(#linearGradient12);fill-opacity:1;stroke:#ffef91;stroke-width:12.8318;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path8"
+     cx="256.2999"
+     cy="257.2999"
+     r="227.2" /><path
+     id="path15"
+     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffef91;stroke-width:15.499;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+     d="m 302.36635,44.362459 c 0,0 -10.94894,36.624745 -16.49527,55.212494 -11.84627,8.682797 -19.6374,16.808737 -19.6374,16.808737 0,0 -21.391,-28.349465 -41.79087,-40.140074 C 204.04292,64.453007 176.5496,65.97212 176.5496,65.97212 c 0,0 -11.42088,3.65e-4 -25.24473,5.058903 -13.82386,5.058538 -19.43394,8.430897 -19.43394,8.430897 0,0 14.02577,-0.375072 34.66138,6.182291 20.63562,6.557362 29.65079,10.492882 29.65079,10.492882 l 28.34775,-5.99567 -7.71253,10.117817 c 0,0 13.52412,8.14986 20.83674,15.45664 7.31262,7.30677 10.71771,11.42782 10.71771,11.42782 0,0 -12.72117,-4.96414 -51.78859,-1.59178 -39.06742,3.37236 -77.5342,51.52215 -77.5342,51.52215 0,0 37.66383,-14.61428 59.90221,-19.48547 22.23838,-4.87118 43.47542,-7.30751 43.47542,-7.30751 0,0 -16.82788,6.74508 -34.85899,35.03543 -18.03112,28.29034 -12.82292,73.25622 -12.82292,73.25622 0,0 28.64945,-53.95774 56.09682,-72.131 27.44737,-18.17328 33.05705,-18.73533 33.05705,-18.73533 0,0 -22.03764,44.21537 -30.65251,115.22225 -8.61486,71.00688 27.64733,189.78848 27.64733,189.78848 l 43.67498,-6.37074 c 0,0 -41.67114,-38.5944 -45.27736,-138.26634 -3.60623,-99.67193 15.22549,-159.25026 15.22549,-159.25026 0,0 15.62776,1.12412 38.86787,29.97652 23.2401,28.85239 36.86244,52.4589 36.86244,52.4589 0,0 8.81678,-46.83904 -10.41641,-68.19731 -19.2332,-21.35826 -48.88515,-30.72483 -48.88515,-30.72483 0,0 12.522,-6.08862 38.46678,-4.30877 25.94477,1.77987 79.76265,24.7859 79.76265,24.78589 0,0 -14.44983,-23.31717 -48.30798,-39.47958 -33.85813,-16.16241 -74.32945,0.26713 -74.32945,0.26713 0,0 3.77869,-14.04506 26.5869,-29.81003 22.80821,-15.764974 51.99208,-31.396311 51.99208,-31.396311 0,0 -24.0829,1.06012 -50.43274,10.996027 -6.55623,2.472198 -12.84933,5.755465 -18.60438,9.294477 L 311.98256,46.04937 Z" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="path6"
+     cx="95.957726"
+     cy="394.82724"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse6"
+     cx="99.829285"
+     cy="376.65375"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse7"
+     cx="148.00078"
+     cy="402.74686"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse8"
+     cx="120.2822"
+     cy="380.68512"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse9"
+     cx="124.24197"
+     cy="422.54584"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse10"
+     cx="191.27571"
+     cy="438.38504"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse11"
+     cx="156.48605"
+     cy="444.0419"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse12"
+     cx="156.39783"
+     cy="421.90857"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse13"
+     cx="165.44879"
+     cy="389.66449"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse14"
+     cx="109.53416"
+     cy="338.25873"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse15"
+     cx="74.373444"
+     cy="369.86551"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse16"
+     cx="211.26932"
+     cy="459.80951"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse17"
+     cx="166.38556"
+     cy="326.66217"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse18"
+     cx="143.81549"
+     cy="310.87485"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse19"
+     cx="54.096996"
+     cy="302.62054"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse20"
+     cx="81.161667"
+     cy="337.62143"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse21"
+     cx="197.21542"
+     cy="389.73611"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse22"
+     cx="206.17815"
+     cy="420.49435"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse23"
+     cx="191.47032"
+     cy="355.72336"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse24"
+     cx="123.39349"
+     cy="289.32693"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse25"
+     cx="107.918"
+     cy="312.29456"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse26"
+     cx="171.10564"
+     cy="305.74896"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse27"
+     cx="209.00658"
+     cy="326.02487"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse28"
+     cx="233.13644"
+     cy="449.69873"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse29"
+     cx="209.57225"
+     cy="264.93088"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse30"
+     cx="218.14577"
+     cy="234.45544"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse31"
+     cx="69.087662"
+     cy="241.52652"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse32"
+     cx="79.464607"
+     cy="276.81027"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse33"
+     cx="119.91112"
+     cy="240.88925"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse34"
+     cx="149.54393"
+     cy="212.82214"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse35"
+     cx="87.384209"
+     cy="220.24173"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse36"
+     cx="51.834263"
+     cy="200.23149"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse37"
+     cx="102.46313"
+     cy="170.81586"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse38"
+     cx="154.70078"
+     cy="270.58774"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse39"
+     cx="129.52776"
+     cy="146.70262"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse40"
+     cx="72.393524"
+     cy="155.47075"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse41"
+     cx="125.37337"
+     cy="97.276749"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse42"
+     cx="158.09486"
+     cy="117.85267"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse43"
+     cx="292.81625"
+     cy="413.77774"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse44"
+     cx="324.70099"
+     cy="394.23505"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse45"
+     cx="320.42599"
+     cy="453.44434"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse46"
+     cx="285.09122"
+     cy="385.42184"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse48"
+     cx="338.44168"
+     cy="426.85901"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse49"
+     cx="317.79169"
+     cy="357.43658"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse51"
+     cx="365.49063"
+     cy="399.36642"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse53"
+     cx="279.23981"
+     cy="358.34058"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse54"
+     cx="327.80048"
+     cy="293.78082"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse56"
+     cx="372.42056"
+     cy="428.29486"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse57"
+     cx="291.59659"
+     cy="322.63077"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse58"
+     cx="359.18237"
+     cy="279.07053"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse59"
+     cx="383.58429"
+     cy="372.29739"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse60"
+     cx="397.37979"
+     cy="415.40317"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse63"
+     cx="350.44458"
+     cy="330.60577"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse64"
+     cx="278.86871"
+     cy="290.38669"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse65"
+     cx="293.07599"
+     cy="256.95929"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse66"
+     cx="449.10278"
+     cy="346.04938"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse67"
+     cx="414.35034"
+     cy="351.19788"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse68"
+     cx="419.44153"
+     cy="384.85614"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse70"
+     cx="283.1795"
+     cy="218.42702"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse71"
+     cx="321.29507"
+     cy="243.71765"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse73"
+     cx="391.73221"
+     cy="329.27985"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse75"
+     cx="393.46164"
+     cy="270.81857"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse76"
+     cx="464.73605"
+     cy="270.14359"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse77"
+     cx="429.25717"
+     cy="321.05084"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse78"
+     cx="353.9671"
+     cy="172.07269"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse79"
+     cx="374.46957"
+     cy="217.13043"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse80"
+     cx="386.14307"
+     cy="187.46037"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse81"
+     cx="424.05527"
+     cy="244.35493"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse82"
+     cx="430.8371"
+     cy="285.26224"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse83"
+     cx="402.7533"
+     cy="221.62213"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse84"
+     cx="455.30573"
+     cy="229.30444"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse85"
+     cx="431.69202"
+     cy="189.20061"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse86"
+     cx="464.40521"
+     cy="195.28293"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse87"
+     cx="440.46014"
+     cy="142.81439"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse88"
+     cx="411.80481"
+     cy="146.70259"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse89"
+     cx="351.93036"
+     cy="98.973793"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /><ellipse
+     style="fill:#e6e6e6;stroke-width:0.696631;paint-order:markers stroke fill"
+     id="ellipse90"
+     cx="370.50977"
+     cy="120.6811"
+     rx="1.2"
+     ry="1.1" /><ellipse
+     style="fill:#ffffff;paint-order:markers stroke fill"
+     id="ellipse91"
+     cx="394.07391"
+     cy="106.04485"
+     rx="1.7"
+     ry="1.6"
+     inkscape:label="Ne" /></svg>

dist/icon_variations/2025.svg

@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   fill="none"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="base.svg"
-   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient24"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#f71baa;stop-opacity:0.56623769;"
-         offset="0"
-         id="stop24" />
-      <stop
-         style="stop-color:#fa87d4;stop-opacity:0.25;"
-         offset="1"
-         id="stop25" />
-    </linearGradient>
-    <rect
-       x="22.627417"
-       y="402.76802"
-       width="521.34025"
-       height="248.94868"
-       id="rect24" />
-    <linearGradient
-       id="linearGradient1"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#fe00b1;stop-opacity:1;"
-         offset="0"
-         id="stop1" />
-      <stop
-         style="stop-color:#fe00b1;stop-opacity:0;"
-         offset="1"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff0950;stop-opacity:0.5;"
-         offset="0"
-         id="stop11" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:0.75;"
-         offset="0.49556771"
-         id="stop20" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="1"
-         id="stop12" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient12"
-       x1="270.39996"
-       y1="39.999989"
-       x2="270.39996"
-       y2="494.39996"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1"
-       id="linearGradient2"
-       x1="125.40197"
-       y1="271.834"
-       x2="431.02424"
-       y2="271.834"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24"
-       id="linearGradient25"
-       x1="270.39996"
-       y1="33.58408"
-       x2="270.39996"
-       y2="500.81589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
-  </defs>
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.88388348"
-     inkscape:cx="141.98704"
-     inkscape:cy="265.87215"
-     inkscape:window-width="1600"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7" />
-  <circle
-     style="fill:url(#linearGradient12);fill-opacity:1;stroke:url(#linearGradient25);stroke-width:13.7948;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     id="path8"
-     cx="256.76401"
-     cy="253.05354"
-     r="244.25046" />
-  <path
-     id="rect1-3"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="M 55.701477,114.37179 A 244.25044,244.25044 0 0 0 44.86493,131.57252 h 423.79699 a 244.25044,244.25044 0 0 0 -10.83655,-17.20073 z" />
-  <path
-     style="fill:#ff2bd5;fill-opacity:1;stroke-width:14.3776;stroke-opacity:0.415999;paint-order:stroke fill markers"
-     d="M 219.6651,499.13816 209.32675,443.18948"
-     id="path9" />
-  <path
-     id="rect1-2"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 58.271509,395.38922 a 244.25044,244.25044 0 0 0 13.54096,17.20073 H 441.71437 a 244.25044,244.25044 0 0 0 13.54097,-17.20073 z" />
-  <path
-     id="rect1-2-5"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 24.604933,328.95264 a 244.25044,244.25044 0 0 0 6.347389,17.20074 H 482.57453 a 244.25044,244.25044 0 0 0 6.34738,-17.20074 z" />
-  <path
-     id="rect1"
-     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 12.586253,259.07464 a 244.25044,244.25044 0 0 0 1.033053,17.20075 H 499.90754 a 244.25044,244.25044 0 0 0 1.03305,-17.20075 z" />
-  <path
-     id="path15"
-     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffffff;stroke-width:17.2007;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 306.21658,12.242412 c 0,0 -11.75029,42.031067 -17.70256,63.362621 -12.7133,9.964494 -21.07468,19.289937 -21.07468,19.289937 0,0 -22.95662,-32.534232 -44.84956,-46.065299 C 200.69681,35.298604 171.19123,37.04196 171.19123,37.04196 c 0,0 -12.25678,4.2e-4 -27.09242,5.805668 -14.83563,5.805249 -20.85631,9.675414 -20.85631,9.675414 0,0 15.05232,-0.430438 37.19828,7.094883 22.14594,7.525322 31.82093,12.041775 31.82093,12.041775 l 30.42255,-6.880714 -8.27702,11.611336 c 0,0 14.51396,9.3529 22.36179,17.738259 7.84785,8.385359 11.50216,13.114729 11.50216,13.114729 0,0 -13.65224,-5.69691 -55.57904,-1.82674 -41.92679,3.87016 -83.20898,59.12752 -83.20898,59.12752 0,0 40.42048,-16.77155 64.28649,-22.36179 23.86602,-5.59024 46.65742,-8.3862 46.65742,-8.3862 0,0 -18.05952,7.74075 -37.41035,40.20714 -19.35082,32.46639 -13.76142,84.06986 -13.76142,84.06986 0,0 30.74631,-61.92266 60.20258,-82.77854 29.45625,-20.8559 35.47652,-21.50092 35.47652,-21.50092 0,0 -23.6506,50.74216 -32.896,132.23065 -9.24539,81.48849 29.67085,217.8039 29.67085,217.8039 l 46.87159,-7.31116 c 0,0 -44.72107,-44.29147 -48.59124,-158.67636 -3.87017,-114.3849 16.33986,-182.75782 16.33986,-182.75782 0,0 16.77156,1.29005 41.71263,34.40147 24.94106,33.11142 39.56043,60.20258 39.56043,60.20258 0,0 9.46208,-53.75314 -11.1788,-78.26419 -20.64088,-24.51105 -52.46309,-35.26025 -52.46309,-35.26025 0,0 13.4385,-6.98738 41.28219,-4.94479 27.84369,2.04258 85.60053,28.44463 85.60053,28.44462 0,0 -15.50743,-26.7591 -51.84367,-45.30731 -36.33623,-18.548198 -79.76967,0.30655 -79.76967,0.30655 0,0 4.05525,-16.118294 28.53281,-34.210394 24.47756,-18.092095 55.79742,-36.030833 55.79742,-36.030833 0,0 -25.84554,1.216607 -54.12395,12.619193 -7.03608,2.837127 -13.78978,6.605056 -19.96604,10.666471 l 17.06635,-53.527632 z" />
-</svg>

dist/icon_variations/base.svg

@@ -6,11 +6,8 @@
    viewBox="0 0 512 512"
    version="1.1"
    id="svg7"
-   sodipodi:docname="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:version="1.4.2 (ebf0e94, 2025-05-08)"
-   inkscape:export-filename="base.svg.2026_01_12_14_43_47.0.svg"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
+   sodipodi:docname="base.svg"
+   inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -19,96 +16,16 @@
   <defs
      id="defs7">
     <linearGradient
-       id="linearGradient1"
+       id="linearGradient24"
        inkscape:collect="always">
       <stop
-         style="stop-color:#ff2e88;stop-opacity:0.5;"
+         style="stop-color:#f71baa;stop-opacity:0.56623769;"
          offset="0"
-         id="stop3" />
+         id="stop24" />
       <stop
-         style="stop-color:#bf42f6;stop-opacity:0.5;"
-         offset="0.44631511"
-         id="stop4" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:0.5;"
-         offset="0.90088946"
-         id="stop2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient138"
-       inkscape:collect="always">
-      <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
-         offset="0"
-         id="stop152" />
-      <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop137" />
-      <stop
-         style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
-         id="stop138" />
-    </linearGradient>
-    <linearGradient
-       id="swatch37"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop37" />
-    </linearGradient>
-    <linearGradient
-       id="swatch28"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#252525;stop-opacity:1;"
-         offset="0"
-         id="stop28" />
-    </linearGradient>
-    <linearGradient
-       id="swatch27"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop27" />
-    </linearGradient>
-    <linearGradient
-       id="swatch15"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop16" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14"
-       inkscape:swatch="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop14" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fa87d4;stop-opacity:0.25;"
          offset="1"
-         id="stop15" />
-    </linearGradient>
-    <linearGradient
-       id="swatch9"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop10" />
-    </linearGradient>
-    <linearGradient
-       id="swatch8"
-       inkscape:swatch="solid">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop9" />
+         id="stop25" />
     </linearGradient>
     <rect
        x="22.627417"
@@ -116,85 +33,65 @@
        width="521.34025"
        height="248.94868"
        id="rect24" />
+    <linearGradient
+       id="linearGradient1"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#fe00b1;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#fe00b1;stop-opacity:0;"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
     <linearGradient
        id="linearGradient11"
        inkscape:collect="always">
       <stop
-         style="stop-color:#ff2e88;stop-opacity:1;"
+         style="stop-color:#ff0950;stop-opacity:0.5;"
          offset="0"
          id="stop11" />
       <stop
-         style="stop-color:#bf42f6;stop-opacity:1;"
-         offset="0.44971901"
-         id="stop154" />
+         style="stop-color:#bf42f6;stop-opacity:0.75;"
+         offset="0.49556771"
+         id="stop20" />
       <stop
          style="stop-color:#5da5ed;stop-opacity:1;"
-         offset="0.89793283"
+         offset="1"
          id="stop12" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient138"
-       id="linearGradient6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.118028,0,0,1.116699,-46.314723,-42.388667)"
+       xlink:href="#linearGradient11"
+       id="linearGradient12"
        x1="270.39996"
-       y1="40.000019"
+       y1="39.999989"
        x2="270.39996"
        y2="494.39996"
-       spreadMethod="pad" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath18">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle18"
-         cx="-246.8315"
-         cy="246.8338"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath22">
-      <circle
-         style="opacity:1;mix-blend-mode:normal;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.8382;stroke-opacity:0.566238;paint-order:stroke fill markers"
-         id="circle22"
-         cx="256"
-         cy="256"
-         inkscape:label="Circle"
-         r="191.89999" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11"
-       id="linearGradient27"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.9401139e-5,-2.8678628)"
-       x1="256.00012"
-       y1="102.94693"
-       x2="256.00012"
-       y2="409.05307" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath128">
-      <circle
-         style="fill:none;fill-opacity:1;stroke:#03ffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-         id="circle128"
-         cx="256"
-         cy="256"
-         r="192" />
-    </clipPath>
+       spreadMethod="reflect"
+       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient1"
        id="linearGradient2"
-       x1="256"
-       y1="64"
-       x2="256"
-       y2="448"
+       x1="125.40197"
+       y1="271.834"
+       x2="431.02424"
+       y2="271.834"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3229974,0,0,1.3214002,-82.687336,-82.290326)" />
+       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient24"
+       id="linearGradient25"
+       x1="270.39996"
+       y1="33.58408"
+       x2="270.39996"
+       y2="500.81589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.075046,0,0,1.075046,-33.928383,-34.198735)" />
   </defs>
   <sodipodi:namedview
      id="namedview7"
@@ -205,26 +102,43 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="261.62951"
-     inkscape:cy="230.87036"
-     inkscape:window-width="1920"
-     inkscape:window-height="1008"
-     inkscape:window-x="1080"
-     inkscape:window-y="351"
+     inkscape:zoom="0.88388348"
+     inkscape:cx="141.98704"
+     inkscape:cy="265.87215"
+     inkscape:window-width="1600"
+     inkscape:window-height="849"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg7" />
+  <circle
+     style="fill:url(#linearGradient12);fill-opacity:1;stroke:url(#linearGradient25);stroke-width:13.7948;stroke-opacity:0.566238;paint-order:stroke fill markers"
+     id="path8"
+     cx="256.76401"
+     cy="253.05354"
+     r="244.25046" />
   <path
-     id="path8-7"
-     style="display:inline;mix-blend-mode:multiply;fill:url(#linearGradient6);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2);stroke-width:3.9666;stroke-dasharray:none;stroke-opacity:0.566238;paint-order:stroke fill markers"
-     inkscape:label="Circle"
-     d="M 256,2.2792898 A 254.0155,253.71401 0 0 0 150.68475,25.115202 c 19.54414,1.070775 38.74692,5.250294 51.56848,11.647658 14.14361,7.056691 28.63804,19.185961 39.4212,29.347551 h 40.60981 c 1.03847,-0.68139 2.10297,-1.36938 3.1938,-2.05957 5.45602,-15.78533 14.79164,-43.183497 19.49612,-57.0097682 A 254.0155,253.71401 0 0 0 256,2.2792898 Z m 61.57106,7.567234 -18.26098,46.1544672 c 7.79702,-4.13918 16.35655,-7.87447 25.20671,-10.87081 23.1229,-7.828433 43.96931,-10.170904 54.94058,-10.868226 A 254.0155,253.71401 0 0 0 317.57106,9.8465238 Z m 65.39277,26.4001532 c -9.68256,4.806644 -33.05532,16.642034 -55.68217,29.863734 H 424.4677 A 254.0155,253.71401 0 0 0 382.96383,36.246677 Z M 113.90698,45.690231 A 254.0155,253.71401 0 0 0 87.532302,66.110411 H 194.2739 c -1.47402,-0.80231 -2.35141,-1.25949 -2.35141,-1.25949 l 10.4496,-11.83348 -38.40568,7.01234 c 0,1e-5 -12.21537,-4.60266 -40.17313,-12.27223 -3.45336,-0.94731 -6.75329,-1.61824 -9.8863,-2.06732 z m -36.803618,30.18635 a 254.0155,253.71401 0 0 0 -34.88372,43.090929 h 59.976738 c 18.11461,-12.04145 40.14252,-22.882149 62.31266,-24.534159 52.93006,-3.9444 70.16538,1.86342 70.16538,1.86342 0,0 -4.612,-4.8206 -14.51938,-13.36656 -2.72366,-2.34942 -6.0844,-4.77373 -9.52455,-7.05363 z m 174.472868,0 c 4.57322,4.7186 7.29716,7.83565 7.29716,7.83565 0,0 3.53501,-3.18484 9.62532,-7.83565 z m 60.27649,0 c -21.56573,15.45339 -25.4703,27.979669 -25.4703,27.979669 0,0 54.83326,-19.215729 100.70543,-0.31228 11.63986,4.79661 21.58481,10.13159 29.94832,15.42354 h 52.74419 A 254.0155,253.71401 0 0 0 434.89664,75.876581 Z M 36.250648,128.73367 A 254.0155,253.71401 0 0 0 16.372095,171.82459 H 147.45478 c 1.45695,-2.5815 3.06539,-5.08648 4.83979,-7.48982 14.23694,-19.28301 27.92088,-30.0088 36.86047,-35.6011 h -30.25323 c -5.87346,0.93472 -12.04945,1.99094 -18.28166,3.16937 -30.12936,5.69727 -81.157618,22.78945 -81.157618,22.78945 0,0 11.47125,-12.39249 29.11369,-25.95882 z m 265.630492,0 c 33.48676,11.2434 52.42799,26.78443 62.7752,43.09092 h 130.97157 a 254.0155,253.71401 0 0 0 -19.87856,-43.09092 h -44.81136 c 14.85233,11.5863 21.59948,20.9854 21.59948,20.9854 0,0 -33.5226,-12.37087 -66.0646,-20.9854 z m -45.96641,16.27007 c -1.00419,0.0106 -10.12705,0.72026 -44.98966,20.64729 -3.12132,1.78406 -6.25434,3.86182 -9.37468,6.17356 h 41.81911 c 7.17181,-17.34774 12.64083,-26.82085 12.64083,-26.82085 0,0 -0.0287,-7.1e-4 -0.0957,0 z m 14.18088,0.0465 c 0,0 -3.31228,9.32762 -7.30492,26.77438 h 51.78554 C 287.6577,146.14158 270.09561,145.0502 270.09561,145.0502 Z M 13.152456,181.59075 A 254.0155,253.71401 0 0 0 3.927651,224.68167 H 134.1447 c 0.56161,-12.72411 2.67825,-28.50188 8.61499,-43.09092 z m 176.661504,0 c -14.27121,13.10564 -27.60733,29.58761 -37.56073,43.09092 h 73.3721 c 4.47018,-16.79061 9.35068,-31.26371 13.86562,-43.09092 z m 70.85787,0 c -2.41384,11.76417 -4.9032,26.20707 -6.94831,43.09092 H 360.4832 c -8.32133,-10.88917 -20.66988,-26.17008 -36.35141,-43.09092 z m 109.17313,0 c 6.63611,15.24089 6.92441,30.5373 5.57882,43.09092 h 132.64857 a 254.0155,253.71401 0 0 0 -9.22481,-43.09092 z M 2.90181,234.44783 A 254.0155,253.71401 0 0 0 1.984498,255.9933 254.0155,253.71401 0 0 0 2.90181,277.53876 h 211.89923 c 2.25762,-15.52555 5.14325,-29.93448 8.3385,-43.09093 h -77.8863 c -6.46396,9.27617 -10.33076,15.56549 -10.33076,15.56549 0,0 -0.82623,-6.14945 -0.9354,-15.56549 z m 249.72093,0 c -1.3692,13.09684 -2.4456,27.49209 -3.02068,43.09093 h 259.49613 a 254.0155,253.71401 0 0 0 0.91731,-21.54546 254.0155,253.71401 0 0 0 -0.91731,-21.54547 H 374.02584 c -0.445,2.5469 -0.90878,4.89768 -1.32817,7.01751 0,0 -1.69726,-2.53821 -4.94056,-7.01751 z M 3.927651,287.30493 a 254.0155,253.71401 0 0 0 9.224805,43.09091 H 214.04393 c -1.29238,-15.40742 -1.57503,-30.04388 -0.41861,-43.09091 z m 245.385009,0 c -0.30355,13.54349 -0.22032,27.92598 0.36951,43.09091 h 249.16537 a 254.0155,253.71401 0 0 0 9.22481,-43.09091 z M 16.369511,340.16201 a 254.0155,253.71401 0 0 0 19.878554,43.09091 H 221.4677 c -2.69781,-14.4523 -4.96108,-29.01285 -6.4832,-43.09091 z m 233.842379,0 c 1.15864,15.47765 3.81286,29.83979 7.51679,43.09091 h 218.02325 a 254.0155,253.71401 0 0 0 19.87856,-43.09091 z M 42.217052,393.01909 a 254.0155,253.71401 0 0 0 34.88372,43.09093 H 233.09561 c -3.40902,-13.67281 -6.76794,-28.2531 -9.73902,-43.09093 z m 218.490958,0 c 5.34985,16.15926 12.22007,30.51982 19.68733,43.09093 h 154.50389 a 254.0155,253.71401 0 0 0 34.88371,-43.09093 z M 87.529722,445.87618 a 254.0155,253.71401 0 0 0 166.229968,63.8208 c -3.67805,-12.0825 -10.85464,-35.49828 -18.18088,-63.8208 z m 199.010328,0 c 17.5887,26.43772 36.99259,43.60598 47.33592,51.61309 a 254.0155,253.71401 0 0 0 90.59431,-51.61309 z" />
+     id="rect1-3"
+     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 55.701477,114.37179 A 244.25044,244.25044 0 0 0 44.86493,131.57252 h 423.79699 a 244.25044,244.25044 0 0 0 -10.83655,-17.20073 z" />
   <path
-     id="path27"
-     style="display:inline;mix-blend-mode:multiply;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient27);stroke-width:3;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
-     d="m 318.98012,441.7375 c -9.87518,-6.73978 -64.39137,-49.0272 -67.68975,-127.81978 -3.69298,-88.21893 15.36468,-141.91029 15.36468,-141.91029 0,0 16.00378,0.99513 39.80316,26.53195 23.79939,25.53753 37.74965,46.43102 37.74965,46.43102 3.91262,-19.79992 12.84563,-66.32402 -60.72865,-87.55523 0,0 12.82326,-5.38883 39.3925,-3.81382 26.56907,1.57572 81.6822,21.93799 81.6822,21.93799 0,0 -14.79766,-20.63773 -49.47063,-34.94295 -34.67291,-14.30533 -76.1182,0.23644 -76.1182,0.23644 0,0 3.86959,-12.43127 27.22669,-26.38478 23.35718,-13.9537 49.27409,-26.501533 49.27409,-26.501533 0,0 -21.97854,-0.26548 -47.67725,8.44535 -6.68948,2.267506 -13.15863,5.094213 -19.05208,8.226563 l 16.05803,-40.634103 -4.4617,-1.89059 -5.1305,-0.95965 c 0,0 -11.24072,33.12428 -16.92051,49.576513 -12.13137,7.68489 -20.11005,14.87735 -20.11005,14.87735 0,0 -21.90573,-25.09227 -42.79668,-35.527803 -26.03412,-13.00525 -86.88249,-13.90359 -94.0044,10.401173 0,0 13.56804,-7.884703 34.70032,-2.080917 21.13214,5.803997 30.3644,9.287307 30.3644,9.287307 l 29.02989,-5.30681 -7.89811,8.95527 c 0,0 13.8496,7.21324 21.33822,13.68063 7.48859,6.46722 10.9757,10.11472 10.9757,10.11472 0,0 -13.02739,-4.39388 -53.03507,-1.40893 -40.00771,2.98473 -79.40016,45.60209 -79.40016,45.60209 0,0 38.57037,-12.93531 61.34393,-17.24677 22.77354,-4.31126 44.52166,-6.46757 44.52166,-6.46757 0,0 -17.23298,5.97003 -35.69792,31.00932 -18.46522,25.03987 -13.13146,64.83866 -13.13146,64.83866 0,0 29.33874,-47.7577 57.44675,-63.84249 28.10798,-16.08527 34.0799,-15.6238 34.0799,-15.6238 0,0 -22.56785,39.13486 -31.39017,101.98268 -8.03005,57.2039 26.77689,163.75449 31.1572,178.89699"
-     sodipodi:nodetypes="cscsccscscscsccccccscscccscscscscscsc"
-     inkscape:label="MainOutline"
-     clip-path="url(#clipPath128)"
-     transform="matrix(1.3229974,0,0,1.3214002,-82.687282,-82.278451)" />
+     style="fill:#ff2bd5;fill-opacity:1;stroke-width:14.3776;stroke-opacity:0.415999;paint-order:stroke fill markers"
+     d="M 219.6651,499.13816 209.32675,443.18948"
+     id="path9" />
+  <path
+     id="rect1-2"
+     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="m 58.271509,395.38922 a 244.25044,244.25044 0 0 0 13.54096,17.20073 H 441.71437 a 244.25044,244.25044 0 0 0 13.54097,-17.20073 z" />
+  <path
+     id="rect1-2-5"
+     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="m 24.604933,328.95264 a 244.25044,244.25044 0 0 0 6.347389,17.20074 H 482.57453 a 244.25044,244.25044 0 0 0 6.34738,-17.20074 z" />
+  <path
+     id="rect1"
+     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:17.2007;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+     d="m 12.586253,259.07464 a 244.25044,244.25044 0 0 0 1.033053,17.20075 H 499.90754 a 244.25044,244.25044 0 0 0 1.03305,-17.20075 z" />
+  <path
+     id="path15"
+     style="fill:url(#linearGradient2);fill-opacity:1;stroke:#ffffff;stroke-width:17.2007;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+     d="m 306.21658,12.242412 c 0,0 -11.75029,42.031067 -17.70256,63.362621 -12.7133,9.964494 -21.07468,19.289937 -21.07468,19.289937 0,0 -22.95662,-32.534232 -44.84956,-46.065299 C 200.69681,35.298604 171.19123,37.04196 171.19123,37.04196 c 0,0 -12.25678,4.2e-4 -27.09242,5.805668 -14.83563,5.805249 -20.85631,9.675414 -20.85631,9.675414 0,0 15.05232,-0.430438 37.19828,7.094883 22.14594,7.525322 31.82093,12.041775 31.82093,12.041775 l 30.42255,-6.880714 -8.27702,11.611336 c 0,0 14.51396,9.3529 22.36179,17.738259 7.84785,8.385359 11.50216,13.114729 11.50216,13.114729 0,0 -13.65224,-5.69691 -55.57904,-1.82674 -41.92679,3.87016 -83.20898,59.12752 -83.20898,59.12752 0,0 40.42048,-16.77155 64.28649,-22.36179 23.86602,-5.59024 46.65742,-8.3862 46.65742,-8.3862 0,0 -18.05952,7.74075 -37.41035,40.20714 -19.35082,32.46639 -13.76142,84.06986 -13.76142,84.06986 0,0 30.74631,-61.92266 60.20258,-82.77854 29.45625,-20.8559 35.47652,-21.50092 35.47652,-21.50092 0,0 -23.6506,50.74216 -32.896,132.23065 -9.24539,81.48849 29.67085,217.8039 29.67085,217.8039 l 46.87159,-7.31116 c 0,0 -44.72107,-44.29147 -48.59124,-158.67636 -3.87017,-114.3849 16.33986,-182.75782 16.33986,-182.75782 0,0 16.77156,1.29005 41.71263,34.40147 24.94106,33.11142 39.56043,60.20258 39.56043,60.20258 0,0 9.46208,-53.75314 -11.1788,-78.26419 -20.64088,-24.51105 -52.46309,-35.26025 -52.46309,-35.26025 0,0 13.4385,-6.98738 41.28219,-4.94479 27.84369,2.04258 85.60053,28.44463 85.60053,28.44462 0,0 -15.50743,-26.7591 -51.84367,-45.30731 -36.33623,-18.548198 -79.76967,0.30655 -79.76967,0.30655 0,0 4.05525,-16.118294 28.53281,-34.210394 24.47756,-18.092095 55.79742,-36.030833 55.79742,-36.030833 0,0 -25.84554,1.216607 -54.12395,12.619193 -7.03608,2.837127 -13.78978,6.605056 -19.96604,10.666471 l 17.06635,-53.527632 z" />
 </svg>

docs/CPMUtil/AddCIPackage.md

@@ -7,14 +7,13 @@
 - `EXTENSION`: Artifact extension (default `tar.zst`)
 - `MIN_VERSION`: Minimum version for `find_package`. Only used if platform does not support this package as a bundled artifact
 - `DISABLED_PLATFORMS`: List of platforms that lack artifacts for this package. Options:
-  - `windows-amd64`
-  - `windows-arm64`
-  - `mingw-amd64`
-  - `mingw-arm64`
-  - `android-x86_64`
-  - `android-aarch64`
-  - `solaris-amd64`
-  - `freebsd-amd64`
-  - `linux-amd64`
-  - `linux-aarch64`
-  - `macos-universal`
+  * `windows-amd64`
+  * `windows-arm64`
+  * `mingw-amd64`
+  * `mingw-arm64`
+  * `android`
+  * `solaris-amd64`
+  * `freebsd-amd64`
+  * `linux-amd64`
+  * `linux-aarch64`
+  * `macos-universal`

docs/CPMUtil/AddJsonPackage.md

@@ -22,11 +22,11 @@ If `ci` is `false`:
 - `sha` -> `SHA`
 - `key` -> `KEY`
 - `tag` -> `TAG`
-  - If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
+  * If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
 - `url` -> `URL`
 - `artifact` -> `ARTIFACT`
-  - If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
-  - If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
+  * If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
+  * If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
 - `git_version` -> `GIT_VERSION`
 - `git_host` -> `GIT_HOST`
 - `source_subdir` -> `SOURCE_SUBDIR`
@@ -101,4 +101,4 @@ In order: OpenSSL CI, Boost (tag + artifact), Opus (options + find_args), discor
         ]
     }
 }
-```
+```

docs/CPMUtil/AddPackage.md

@@ -17,7 +17,7 @@
 - `URL`: The URL to fetch.
 - `REPO`: The repo to use (`owner/repo`).
 - `GIT_HOST`: The Git host to use
-  - Defaults to `github.com`. Do not include the protocol, as HTTPS is enforced.
+  * Defaults to `github.com`. Do not include the protocol, as HTTPS is enforced.
 - `TAG`: The tag to fetch, if applicable.
 - `ARTIFACT`: The name of the artifact, if applicable.
 - `SHA`: Commit sha to fetch, if applicable.
@@ -26,23 +26,23 @@
 The following configurations are supported, in descending order of precedence:
 
 - `URL`: Bare URL download, useful for custom artifacts
-  - If this is set, `GIT_URL` or `REPO` should be set to allow the dependency viewer to link to the project's Git repository.
-  - If this is NOT set, `REPO` must be defined.
+  * If this is set, `GIT_URL` or `REPO` should be set to allow the dependency viewer to link to the project's Git repository.
+  * If this is NOT set, `REPO` must be defined.
 - `REPO + TAG + ARTIFACT`: GitHub release artifact
-  - The final download URL will be `https://github.com/${REPO}/releases/download/${TAG}/${ARTIFACT}`
-  - Useful for prebuilt libraries and prefetched archives
+  * The final download URL will be `https://github.com/${REPO}/releases/download/${TAG}/${ARTIFACT}`
+  * Useful for prebuilt libraries and prefetched archives
 - `REPO + TAG`: GitHub tag archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/tags/${TAG}.tar.gz`
-  - Useful for pinning to a specific tag, better for build identification
+  * The final download URL will be `https://github.com/${REPO}/archive/refs/tags/${TAG}.tar.gz`
+  * Useful for pinning to a specific tag, better for build identification
 - `REPO + SHA`: GitHub commit archive
-  - The final download URL will be `https://github.com/${REPO}/archive/${SHA}.zip`
-  - Useful for pinning to a specific commit
+  * The final download URL will be `https://github.com/${REPO}/archive/${SHA}.zip`
+  * Useful for pinning to a specific commit
 - `REPO + BRANCH`: GitHub branch archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/${BRANCH}.zip`
-  - Generally not recommended unless the branch is frozen
+  * The final download URL will be `https://github.com/${REPO}/archive/refs/heads/${BRANCH}.zip`
+  * Generally not recommended unless the branch is frozen
 - `REPO`: GitHub master archive
-  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/master.zip`
-  - Generally not recommended unless the project is dead
+  * The final download URL will be `https://github.com/${REPO}/archive/refs/heads/master.zip`
+  * Generally not recommended unless the project is dead
 
 ## Hashing
 
@@ -54,20 +54,20 @@ Hashing strategies, descending order of precedence:
 
 - `HASH`: Bare hash verification, useful for static downloads e.g. commit archives
 - `HASH_SUFFIX`: Download the hash as `${DOWNLOAD_URL}.${HASH_SUFFIX}`
-  - The downloaded hash *must* match the hash algorithm and contain nothing but the hash; no filenames or extra content.
+  * The downloaded hash *must* match the hash algorithm and contain nothing but the hash; no filenames or extra content.
 - `HASH_URL`: Download the hash from a separate URL
 
 ## Other Options
 
 - `KEY`: Custom cache key to use (stored as `.cache/cpm/${packagename_lower}/${key}`)
-  - Default is based on, in descending order of precedence:
+  * Default is based on, in descending order of precedence:
     - First 4 characters of the sha
     - `GIT_VERSION`
     - Tag
     - `VERSION`
     - Otherwise, CPM defaults will be used. This is not recommended as it doesn't produce reproducible caches
 - `DOWNLOAD_ONLY`: Whether or not to configure the downloaded package via CMake
-  - Useful to turn `OFF` if the project doesn't use CMake
+  * Useful to turn `OFF` if the project doesn't use CMake
 - `SOURCE_SUBDIR`: Subdirectory of the project containing a CMakeLists.txt file
 - `FIND_PACKAGE_ARGUMENTS`: Arguments to pass to the `find_package` call
 - `BUNDLED_PACKAGE`: Set to `ON` to default to the bundled package
@@ -80,14 +80,12 @@ Hashing strategies, descending order of precedence:
 
 For each added package, users may additionally force usage of the system/bundled package.
 
-- `${package}_DIR`: Path to a separately-downloaded copy of the package. Note that versioning is not checked!
 - `${package}_FORCE_SYSTEM`: Require the package to be installed on the system
 - `${package}_FORCE_BUNDLED`: Force the package to be fetched and use the bundled version
 
 ## System/Bundled Packages
 
 Descending order of precedence:
-
 - If `${package}_FORCE_SYSTEM` is true, requires the package to be on the system
 - If `${package}_FORCE_BUNDLED` is true, forcefully uses the bundled package
 - If `CPMUTIL_FORCE_SYSTEM` is true, requires the package to be on the system
@@ -103,8 +101,8 @@ URLs:
 
 - `GIT_URL`
 - `REPO` as a Git repository
-  - You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
-  - If `GIT_HOST` is unspecified, defaults to `github.com`
+  * You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
+  * If `GIT_HOST` is unspecified, defaults to `github.com`
 - `URL`
 
 Versions (bundled):
@@ -115,4 +113,4 @@ Versions (bundled):
 - `TAG`
 - "unknown"
 
-If the package is a system package, AddPackage will attempt to determine the package version and append `(system)` to the identifier. Otherwise, it will be marked as `unknown (system)`
+If the package is a system package, AddPackage will attempt to determine the package version and append ` (system)` to the identifier. Otherwise, it will be marked as `unknown (system)`

docs/CPMUtil/AddQt.md

@@ -1,28 +0,0 @@
-# AddQt
-
-Simply call `AddQt(<Qt Version>)` before any Qt `find_package` calls and everything will be set up for you. On Linux, the bundled Qt library is built as a shared library, and provided you have OpenSSL and X11, everything should just work.
-
-On Windows, MinGW, and MacOS, Qt is bundled as a static library. No further action is needed, as the provided libraries automatically integrate the Windows/Cocoa plugins, alongside the corresponding Multimedia and Network plugins.
-
-## Modules
-
-The following modules are bundled into these Qt builds:
-
-- Base (Gui, Core, Widgets, Network)
-- Multimedia
-- Declarative (Quick, QML)
-- Linux: Wayland client
-
-Each platform has the corresponding QPA built in and set as the default as well. This means you don't need to add `Q_IMPORT_PLUGIN`!
-
-## Example
-
-See an example in the [`tests/qt`](https://git.crueter.xyz/CMake/CPMUtil/src/branch/master/tests/qt/CMakeLists.txt) directory.
-
-## Versions
-
-The following versions have available builds:
-
-- 6.9.3
-
-See [`crueter-ci/Qt`](https://github.com/crueter-ci/Qt) for an updated list at any time.

docs/CPMUtil/README.md

@@ -5,7 +5,7 @@ CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful u
 Global Options:
 
 - `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
-  - You may optionally override this (section)
+  * You may optionally override this (section)
 - `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
 
 You are highly encouraged to read AddPackage first, even if you plan to only interact with CPMUtil via `AddJsonPackage`.
@@ -13,7 +13,6 @@ You are highly encouraged to read AddPackage first, even if you plan to only int
 - [AddPackage](#addpackage)
 - [AddCIPackage](#addcipackage)
 - [AddJsonPackage](#addjsonpackage)
-- [AddQt](#addqt)
 - [Lists](#lists)
 - [For Packagers](#for-packagers)
   - [Network Sandbox](#network-sandbox)
@@ -31,10 +30,6 @@ The core of CPMUtil is the [`AddPackage`](./AddPackage.md) function. [`AddPackag
 
 [`AddJsonPackage`](./AddJsonPackage.md) is the recommended method of usage for CPMUtil.
 
-## AddQt
-
-[`AddQt`](./AddQt.md) adds a specific version of Qt to your project.
-
 ## Lists
 
 CPMUtil will create three lists of dependencies where `AddPackage` or similar was used. Each is in order of addition.
@@ -42,8 +37,8 @@ CPMUtil will create three lists of dependencies where `AddPackage` or similar wa
 - `CPM_PACKAGE_NAMES`: The names of packages included by CPMUtil
 - `CPM_PACKAGE_URLS`: The URLs to project/repo pages of packages
 - `CPM_PACKAGE_SHAS`: Short version identifiers for each package
-  - If the package was included as a system package, `(system)` is appended thereafter
-  - Packages whose versions can't be deduced will be left as `unknown`.
+    * If the package was included as a system package, ` (system)` is appended thereafter
+    * Packages whose versions can't be deduced will be left as `unknown`.
 
 For an example of how this might be implemented in an application, see Eden's implementation:
 
@@ -59,8 +54,6 @@ If you are packaging a project that uses CPMUtil, read this!
 
 For sandboxed environments (e.g. Gentoo, nixOS) you must install all dependencies to the system beforehand and set `-DCPMUTIL_FORCE_SYSTEM=ON`. If a dependency is missing, get creating!
 
-Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-DPackageName_DIR=/path/to/downloaded/dir` (e.g. shaders)
-
 ### Unsandboxed
 
-For others (AUR, MPR, etc). CPMUtil will handle everything for you, including if some of the project's dependencies are missing from your distribution's repositories. That is pretty much half the reason I created this behemoth, after all.
+For others (AUR, MPR, etc). CPMUtil will handle everything for you, including if some of the project's dependencies are missing from your distribution's repositories. That is pretty much half the reason I created this behemoth, after all.

docs/build/Android.md

@@ -76,12 +76,12 @@ The APK and AAB will be output into "artifacts".
 
 Examples:
 
-* Build legacy release with update checker:
-  * `.ci/android/build.sh -r -t legacy`
+* Build legacy release with update checker for ChromeOS:
+  * `.ci/android/build.sh -c -r -t legacy`
 * Build standard release with debug info without update checker for phones:
   * `.ci/android/build.sh -b RelWithDebInfo`
-* Build optimized release with update checker for ChromeOS:
-  * `.ci/android/build.sh -c -r -t optimized`
+* Build optimized release with update checker:
+  * `.ci/android/build.sh -r -t optimized`
 
 ### Additional Resources
 

docs/user/AddingBooleanToggles.md

@@ -9,28 +9,32 @@ This guide will walk you through adding a new boolean toggle setting to Eden's c
 
 ## Index
 
-1. [Step 1 - Common Setting](#step-1-common-setting)
-2. [Step 2 - Qt Toggle](#step-2-qt-toggle)
-3. [Step 3 - Kotlin (Android)](#step-3-kotlin-android)
+1. [Step 1 - src/common/settings](#step-1-src-common-settings)
+2. [Qt's (PC) Steps](#qt-pc-steps)
 
-   * [Step 3.1 - BooleanSetting.kt](#step-3-1-booleansetting-kt)
-   * [Step 3.2 - SettingsItem.kt](#step-3-2-settingsitem-kt)
-   * [Step 3.3 - SettingsFragmentPresenter.kt](#step-3-3-settingsfragmentpresenter-kt)
-   * [Step 3.4 - Localization](#step-3-4-localization)
-4. [Step 4 - Use Your Toggle](#step-4-use-your-toggle)
+   * [Step 2 - src/qt_common/config/shared_translation.cpp](#step-2-src-qt_common-config-shared_translation-cpp)
+3. [ Kotlin's (Android) Steps](#android-steps)
+
+   * [Step 3 - BooleanSetting.kt](#step-3-src-android-app-src-main-java-org-yuzu-yuzu_emu-features-settings-model-booleansetting-kt)
+   * [Step 4 - SettingsItem.kt](#step-4-src-android-app-src-main-java-org-yuzu-yuzu_emu-features-settings-model-view-settingsitem-kt)
+   * [Step 5 - SettingsFragmentPresenter.kt](#step-5-src-android-app-src-main-java-org-yuzu-yuzu_emu-features-settings-ui-settingsfragmentpresenter-kt)
+   * [Step 6 - strings.xml](#step-6-src-android-app-src-main-res-values-strings-xml)
+4. [Step 7 - Use Your Toggle](#step-7-use-your-toggle)
 5. [Best Practices](#best-practices)
 
 ---
 
-## Step 1 - Common Setting
+## Step 1 - src/common/settings.
 
-Firstly add your desired toggle:
+Firstly add your desired toggle inside `setting.h`,
+Example:
 
-Example: `src/common/setting.h`
-```cpp
+```
 SwitchableSetting<bool> your_setting_name{linkage, false, "your_setting_name", Category::RendererExtensions};
 ```
 
+NOTE - If you wish for your toggle to be on by default then change `false` to `true` after `linkage,`.
+
 ### Remember to add your toggle to the appropriate category, for example:
 
 Common Categories:
@@ -41,17 +45,17 @@ Common Categories:
 * Category::System
 * Category::Core
 
-> [!WARNING]
-> If you wish for your toggle to be `on by default` then change `false` to `true` after `linkage,`.
-
 ---
 
-## Step 2 - Qt Toggle
+## Qt (PC) Steps
 
-Add the toggle to the Qt UI, where you wish for it to appear and place it there.
+### Step 2 - src/qt_common/config/shared_translation.cpp
 
-Example: `src/qt_common/config/shared_translation.cpp`
-```cpp
+Now you can add the toggle to the QT (PC) UI inside `shared_translation.cpp`,
+Find where you wish for it to appear and place it there.
+Example:
+
+```
 INSERT(Settings,
        your_setting_name,
        tr("Your Setting Display Name"),
@@ -68,29 +72,25 @@ INSERT(Settings,
 
 ---
 
-## Step 3 - Kotlin (Android)
+## Android Steps
 
-### Step 3.1 - BooleanSetting.kt
+### Step 3 - src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt
 
-Add where it should be in the settings.
+Now add it inside `BooleanSetting.kt` where it should be in the settings.
+Example:
 
-Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt`
-```kts
+```
 RENDERER_YOUR_SETTING_NAME("your_setting_name"),
 ```
 
-### Make sure to:
+Remember to make sure the naming of the prefix matches the desired category.
 
-* Ensure the prefix naming matches the intended category.
+### Step 4 - src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
 
----
+Now you may add the toggle to the Kotlin (Android) UI inside `SettingsItem.kt`.
+Example:
 
-### Step 3.2 - SettingsItem.kt
-
-Add the toggle to the Kotlin (Android) UI
-
-Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt`
-```kts
+```
 put(
     SwitchSetting(
         BooleanSetting.RENDERER_YOUR_SETTING_NAME,
@@ -100,41 +100,36 @@ put(
 )
 ```
 
----
+### Step 5 - src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
 
-### Step 3.3 - SettingsFragmentPresenter.kt
+Now add your setting to the correct location inside `SettingsFragmentPresenter.kt` within the right category.
+Example:
 
-Add your setting within the right category.
-
-Example: `src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt`
-```kts
+```
 add(BooleanSetting.RENDERER_YOUR_SETTING_NAME.key)
 ```
 
-> [!WARNING]
-> Remember, placing matters! Settings appear in the order of where you add them.
+Remember, placing matters! Settings appear in the order of where you add them.
 
----
+### Step 6 - src/android/app/src/main/res/values/strings.xml
 
-### Step 3.4 - Localization
+Now add your setting and description to `strings.xml` in the appropriate place.
+Example:
 
-Add your setting and description in the appropriate place.
-
-Example: `src/android/app/src/main/res/values/strings.xml`
-```xml
+```
 <string name="your_setting_name">Your Setting Display Name</string>
 <string name="your_setting_name_description">Detailed description of what this setting does. Explain any caveats, requirements, or warnings here.</string>
 ```
 
 ---
 
-## Step 4 - Use Your Toggle!
+## Step 7 - Use Your Toggle!
 
 Now the UI part is done find a place in the code for the toggle,
 And use it to your heart's desire!
-
 Example:
-```cpp
+
+```
 const bool your_value = Settings::values.your_setting_name.GetValue();
 
 if (your_value) {

docs/user/AddingDebugKnobs.md

@@ -38,7 +38,6 @@ Common advantages recap:
 Use the `Settings::getDebugKnobAt(u8 i)` function to check if a specific bit is set:
 
 ```cpp
-//cpp side
 #include "common/settings.h"
 
 // Check if bit 0 is set
@@ -48,14 +47,6 @@ bool feature_enabled = Settings::getDebugKnobAt(0);
 bool another_feature = Settings::getDebugKnobAt(15);
 ```
 
-```kts
-//kotlin side
-import org.yuzu.yuzu_emu.features.settings.model.Settings
-
-// Check if bit x is set
-bool feature_enabled = Settings.getDebugKnobAt(x); //x as integer from 0 to 15
-```
-
 The function returns `true` if the specified bit (0-15) is set in the `debug_knobs` value, `false` otherwise.
 
 ### Setting Debug Knobs (user side)

externals/CMakeLists.txt

@@ -25,7 +25,7 @@ set(BUILD_SHARED_LIBS OFF)
 # Skip install rules for all externals
 set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON)
 
-# Xbyak
+# Xbyak (also used by Dynarmic, so needs to be added first)
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     if (PLATFORM_SUN OR PLATFORM_OPENBSD OR PLATFORM_NETBSD OR PLATFORM_DRAGONFLY)
         AddJsonPackage(xbyak_sun)
@@ -34,19 +34,11 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     endif()
 endif()
 
-# Oaknut
+# Oaknut (also used by Dynarmic, so needs to be added first)
 if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
     AddJsonPackage(oaknut)
 endif()
 
-# biscuit
-if (ARCHITECTURE_riscv64)
-    AddJsonPackage(biscuit)
-endif()
-
-# mcl
-AddJsonPackage(mcl)
-
 # enet
 AddJsonPackage(enet)
 

externals/cmake-modules/DefaultConfig.cmake

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## DefaultConfig ##
 

externals/cmake-modules/DetectArchitecture.cmake

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## DetectArchitecture ##
 #[[
@@ -93,129 +93,133 @@ function(detect_architecture_symbols)
     endforeach()
 endfunction()
 
-# arches here are put in a sane default order of importance
-# notably, amd64, arm64, and riscv (in order) are BY FAR the most common
-# mips is pretty popular in embedded
-# ppc64 is pretty popular in supercomputing
-# sparc is uh
-# ia64 exists
-# the rest exist, but are probably less popular than ia64
+function(DetectArchitecture)
+    # arches here are put in a sane default order of importance
+    # notably, amd64, arm64, and riscv (in order) are BY FAR the most common
+    # mips is pretty popular in embedded
+    # ppc64 is pretty popular in supercomputing
+    # sparc is uh
+    # ia64 exists
+    # the rest exist, but are probably less popular than ia64
 
-detect_architecture_symbols(
-    ARCH arm64
-    SYMBOLS
-        "__ARM64__"
-        "__aarch64__"
-        "_M_ARM64")
+    detect_architecture_symbols(
+        ARCH arm64
+        SYMBOLS
+            "__ARM64__"
+            "__aarch64__"
+            "_M_ARM64")
 
-detect_architecture_symbols(
-    ARCH x86_64
-    SYMBOLS
-        "__x86_64"
-        "__x86_64__"
-        "__amd64"
-        "_M_X64"
-        "_M_AMD64")
+    detect_architecture_symbols(
+        ARCH x86_64
+        SYMBOLS
+            "__x86_64"
+            "__x86_64__"
+            "__amd64"
+            "_M_X64"
+            "_M_AMD64")
 
-# riscv is interesting since it generally does not define a riscv64-specific symbol
-# We can, however, check for the rv32 zcf extension which is good enough of a heuristic on GCC
-detect_architecture_symbols(
-    ARCH riscv
-    SYMBOLS
-        "__riscv_zcf")
+    # riscv is interesting since it generally does not define a riscv64-specific symbol
+    # We can, however, check for the rv32 zcf extension which is good enough of a heuristic on GCC
+    detect_architecture_symbols(
+        ARCH riscv
+        SYMBOLS
+            "__riscv_zcf")
 
-# if zcf doesn't exist we can safely assume it's riscv64
-detect_architecture_symbols(
-    ARCH riscv64
-    SYMBOLS
-        "__riscv")
+    # if zcf doesn't exist we can safely assume it's riscv64
+    detect_architecture_symbols(
+        ARCH riscv64
+        SYMBOLS
+            "__riscv")
 
-detect_architecture_symbols(
-    ARCH x86
-    SYMBOLS
-        "__i386"
-        "__i386__"
-        "_M_IX86")
+    detect_architecture_symbols(
+        ARCH x86
+        SYMBOLS
+            "__i386"
+            "__i386__"
+            "_M_IX86")
 
-detect_architecture_symbols(
-    ARCH arm
-    SYMBOLS
-        "__arm__"
-        "__TARGET_ARCH_ARM"
-        "_M_ARM")
+    detect_architecture_symbols(
+        ARCH arm
+        SYMBOLS
+            "__arm__"
+            "__TARGET_ARCH_ARM"
+            "_M_ARM")
 
-detect_architecture_symbols(
-    ARCH ia64
-    SYMBOLS
-        "__ia64"
-        "__ia64__"
-        "_M_IA64")
+    detect_architecture_symbols(
+        ARCH ia64
+        SYMBOLS
+            "__ia64"
+            "__ia64__"
+            "_M_IA64")
 
-# mips is probably the least fun to detect due to microMIPS
-# Because microMIPS is such cancer I'm considering it out of scope for now
-detect_architecture_symbols(
-    ARCH mips64
-    SYMBOLS
-        "__mips64")
+    # mips is probably the least fun to detect due to microMIPS
+    # Because microMIPS is such cancer I'm considering it out of scope for now
+    detect_architecture_symbols(
+        ARCH mips64
+        SYMBOLS
+            "__mips64")
 
-detect_architecture_symbols(
-    ARCH mips
-    SYMBOLS
-        "__mips"
-        "__mips__"
-        "_M_MRX000")
+    detect_architecture_symbols(
+        ARCH mips
+        SYMBOLS
+            "__mips"
+            "__mips__"
+            "_M_MRX000")
 
-detect_architecture_symbols(
-    ARCH ppc64
-    SYMBOLS
-        "__ppc64__"
-        "__powerpc64__"
-        "_ARCH_PPC64"
-        "_M_PPC64")
+    detect_architecture_symbols(
+        ARCH ppc64
+        SYMBOLS
+            "__ppc64__"
+            "__powerpc64__"
+            "_ARCH_PPC64"
+            "_M_PPC64")
 
-detect_architecture_symbols(
-    ARCH ppc
-    SYMBOLS
-        "__ppc__"
-        "__ppc"
-        "__powerpc__"
-        "_ARCH_COM"
-        "_ARCH_PWR"
-        "_ARCH_PPC"
-        "_M_MPPC"
-        "_M_PPC")
+    detect_architecture_symbols(
+        ARCH ppc
+        SYMBOLS
+            "__ppc__"
+            "__ppc"
+            "__powerpc__"
+            "_ARCH_COM"
+            "_ARCH_PWR"
+            "_ARCH_PPC"
+            "_M_MPPC"
+            "_M_PPC")
 
-detect_architecture_symbols(
-    ARCH sparc64
-    SYMBOLS
-        "__sparc_v9__")
+    detect_architecture_symbols(
+        ARCH sparc64
+        SYMBOLS
+            "__sparc_v9__")
 
-detect_architecture_symbols(
-    ARCH sparc
-    SYMBOLS
-        "__sparc__"
-        "__sparc")
+    detect_architecture_symbols(
+        ARCH sparc
+        SYMBOLS
+            "__sparc__"
+            "__sparc")
 
-# I don't actually know about loongarch32 since crossdev does not support it, only 64
-detect_architecture_symbols(
-    ARCH loongarch64
-    SYMBOLS
-        "__loongarch__"
-        "__loongarch64")
+    # I don't actually know about loongarch32 since crossdev does not support it, only 64
+    detect_architecture_symbols(
+        ARCH loongarch64
+        SYMBOLS
+            "__loongarch__"
+            "__loongarch64")
 
-detect_architecture_symbols(
-    ARCH wasm
-    SYMBOLS
-        "__EMSCRIPTEN__")
+    detect_architecture_symbols(
+        ARCH wasm
+        SYMBOLS
+            "__EMSCRIPTEN__")
 
-# "generic" target
-# If you have reached this point, you're on some as-of-yet unsupported architecture.
-# See the docs up above for known unsupported architectures
-# If you're not in the list... I think you know what you're doing.
-if (NOT DEFINED ARCHITECTURE)
-    set(ARCHITECTURE "GENERIC")
-    set(ARCHITECTURE_GENERIC 1)
-    add_definitions(-DARCHITECTURE_GENERIC=1)
-endif()
+    # "generic" target
+    # If you have reached this point, you're on some as-of-yet unsupported architecture.
+    # See the docs up above for known unsupported architectures
+    # If you're not in the list... I think you know what you're doing.
+    if (NOT DEFINED ARCHITECTURE)
+        set(ARCHITECTURE "GENERIC")
+        set(ARCHITECTURE_GENERIC 1)
+        add_definitions(-DARCHITECTURE_GENERIC=1)
+    endif()
 
-message(STATUS "[DetectArchitecture] Target architecture: ${ARCHITECTURE}")
+    message(STATUS "[DetectArchitecture] Target architecture: ${ARCHITECTURE}")
+    set(ARCHITECTURE "${ARCHITECTURE}" PARENT_SCOPE)
+    set(ARCHITECTURE_${ARCHITECTURE} 1 PARENT_SCOPE)
+endfunction()

externals/cmake-modules/DetectPlatform.cmake

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## DetectPlatform ##
 
@@ -147,6 +147,5 @@ endif()
 
 # awesome
 if (PLATFORM_FREEBSD OR PLATFORM_DRAGONFLYBSD)
-    set(CMAKE_EXE_LINKER_FLAGS
-        "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/local/lib")
-endif()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/local/lib")
+endif()

externals/cmake-modules/FasterLinker.cmake

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## FasterLinker ##
 
@@ -12,45 +12,47 @@
     - mold (GCC only) - generally does well on GCC
     - lld - preferred on clang
     - bfd - the final fallback
-    - If none are found just use the default linker
+    - If none are found (macOS uses ld.prime, etc) just use the default linker
 ]]
 
 # This module is based on the work of Yuzu, specifically Liam White,
 # and later extended by crueter.
 
-option(USE_FASTER_LINKER "Attempt to use a faster linker program" OFF)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(CXX_GCC ON)
+endif()
 
-if (USE_FASTER_LINKER)
-    macro(find_linker ld)
-        find_program(LINKER_${ld} ld.${ld})
-        if (LINKER_${ld})
-            set(LINKER ${ld})
-        endif()
-    endmacro()
+find_program(LINKER_BFD bfd)
+if (LINKER_BFD)
+    set(LINKER bfd)
+endif()
 
-    find_linker(bfd)
-    find_linker(lld)
+find_program(LINKER_LLD lld)
+if (LINKER_LLD)
+    set(LINKER lld)
+endif()
 
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        find_program(LINKER_MOLD mold)
-        if (LINKER_MOLD AND
-            CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
-            set(LINKER mold)
-        endif()
-
-        find_linker(gold)
-
-        if (LINKER STREQUAL "lld")
-            message(WARNING
-                "[FasterLinker] Using lld on GCC may cause issues.\
-                 Install mold, gold, or disable USE_FASTER_LINKER.")
-        endif()
+if (CXX_GCC)
+    find_program(LINKER_MOLD mold)
+    if (LINKER_MOLD AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1")
+        set(LINKER mold)
     endif()
 
-    if (LINKER)
-        message(NOTICE "[FasterLinker] Selecting ${LINKER} as linker")
-        add_link_options("-fuse-ld=${LINKER}")
-    else()
-        message(WARNING "[FasterLinker] No faster linker found--using default")
+    find_program(LINKER_GOLD gold)
+    if (LINKER_GOLD)
+        set(LINKER gold)
     endif()
-endif()
+endif()
+
+if (LINKER)
+    message(NOTICE "[FasterLinker] Selecting ${LINKER} as linker")
+    add_link_options("-fuse-ld=${LINKER}")
+else()
+    message(WARNING "[FasterLinker] No faster linker found--using default")
+endif()
+
+if (LINKER STREQUAL "lld" AND CXX_GCC)
+    message(WARNING
+        "[FasterLinker] Using lld on GCC may cause issues "
+        "with certain LTO settings.")
+endif()

externals/cmake-modules/GetSCMRev.cmake

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## GetSCMRev ##
 # Name is self explanatory. Gets revision information from files, OR from git.
@@ -13,8 +13,6 @@ find_package(Git QUIET)
 # tag:    git describe --tags --abbrev=0
 # branch: git rev-parse --abbrev-ref=HEAD
 
-# TODO: string overrides
-
 function(run_git_command variable)
     if(NOT GIT_FOUND)
         set(${variable} "GIT-NOTFOUND" PARENT_SCOPE)

externals/cmake-modules/UseCcache.cmake

@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## UseCcache ##
 

externals/cmake-modules/UseLTO.cmake

@@ -1,21 +1,17 @@
 # SPDX-FileCopyrightText: Copyright 2025 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 ## UseLTO ##
 
 # Enable Interprocedural Optimization (IPO).
 # Self-explanatory.
 
-option(ENABLE_LTO "Enable Link-Time Optimization (LTO)" OFF)
-
-if (ENABLE_LTO)
-    include(CheckIPOSupported)
-    check_ipo_supported(RESULT COMPILER_SUPPORTS_LTO)
-    if(NOT COMPILER_SUPPORTS_LTO)
-        message(FATAL_ERROR
-        "Your compiler does not support interprocedural optimization"
-        " (IPO). Disable ENABLE_LTO and try again.")
-    endif()
-    set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})
-endif()
+include(CheckIPOSupported)
+check_ipo_supported(RESULT COMPILER_SUPPORTS_LTO)
+if(NOT COMPILER_SUPPORTS_LTO)
+    message(FATAL_ERROR
+    "Your compiler does not support interprocedural optimization"
+    " (IPO).")
+endif()
+set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})

externals/cpmfile.json

@@ -23,7 +23,7 @@
         "package": "sirit",
         "name": "sirit",
         "repo": "eden-emulator/sirit",
-        "version": "1.0.4"
+        "version": "1.0.3"
     },
     "httplib": {
         "repo": "yhirose/cpp-httplib",
@@ -71,9 +71,9 @@
         "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856"
     },
     "libadrenotools": {
-        "repo": "eden-emulator/libadrenotools",
-        "sha": "8ba23b42d7",
-        "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
+        "repo": "bylaws/libadrenotools",
+        "sha": "8fae8ce254",
+        "hash": "db4a74ce15559c75e01d1868a90701519b655d77f2a343bbee283a42f8332dc9046960fb022dc969f205e457348a3f99cb8be6e1cd91264d2ae1235294b9f9b2",
         "patches": [
             "0001-linkerns-cpm.patch"
         ]
@@ -180,8 +180,8 @@
     "discord-rpc": {
         "package": "DiscordRPC",
         "repo": "eden-emulator/discord-rpc",
-        "sha": "0d8b2d6a37",
-        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
+        "sha": "1cf7772bb6",
+        "hash": "9a6c35887dcacceb4ba1bf3141edb73b05b2abc719a8d81dad9cb9dd5b039ce203946787335d9d738af669c10cf2534638b645635a22096fc28dcae2475e0cbe",
         "find_args": "MODULE"
     },
     "simpleini": {
@@ -225,57 +225,5 @@
         "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
         "version": "1.7",
         "find_args": "MODULE"
-    },
-    "biscuit": {
-        "repo": "lioncash/biscuit",
-        "tag": "v%VERSION%",
-        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
-        "version": "0.9.1",
-        "git_version": "0.19.0"
-    },
-    "mcl": {
-        "version": "0.1.12",
-        "repo": "azahar-emu/mcl",
-        "sha": "7b08d83418",
-        "hash": "9c6ba624cb22ef622f78046a82abb99bf5026284ba17dfacaf46ac842cbd3b0f515f5ba45a1598c7671318a78a2e648db72ce8d10e7537f34e39800bdcb57694",
-        "options": [
-            "MCL_INSTALL OFF"
-        ],
-        "patches": [
-            "0001-assert-macro.patch"
-        ]
-    },
-    "libusb": {
-        "repo": "libusb/libusb",
-        "tag": "v%VERSION%",
-        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
-        "find_args": "MODULE",
-        "git_version": "1.0.29",
-        "patches": [
-            "0001-netbsd-gettime.patch"
-        ]
-    },
-    "ffmpeg": {
-        "repo": "FFmpeg/FFmpeg",
-        "sha": "5e56937b74",
-        "hash": "9ab0457dcd6ce6359b5053c1662f57910d332f68ca0cca9d4134d858464840917027374de3d97e0863c3a7daaea2fe4f4cd17d1c6d8e7f740f4ad91e71c2932b",
-        "bundled": true
-    },
-    "ffmpeg-ci": {
-        "ci": true,
-        "package": "FFmpeg",
-        "name": "ffmpeg",
-        "repo": "crueter-ci/FFmpeg",
-        "version": "8.0.1-5e56937b74",
-        "min_version": "4.1"
-    },
-    "tzdb": {
-        "package": "nx_tzdb",
-        "repo": "misc/tzdb_to_nx",
-        "git_host": "git.crueter.xyz",
-        "artifact": "%VERSION%.tar.gz",
-        "tag": "%VERSION%",
-        "hash": "dc37a189a44ce8b5c988ca550582431a6c7eadfd3c6e709bee6277116ee803e714333e85c9e6cbb5c69346a14d6f2cc7ed96e8aa09cc5fb8a89f945059651db6",
-        "version": "121125"
     }
 }

externals/ffmpeg/CMakeLists.txt

@@ -4,6 +4,8 @@
 # SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+include(CPMUtil)
+
 # TODO(crueter, MaranBr): Externals FFmpeg 8.0
 
 set(FFmpeg_HWACCEL_LIBRARIES)

externals/ffmpeg/cpmfile.json

@@ -0,0 +1,16 @@
+{
+    "ffmpeg": {
+        "repo": "FFmpeg/FFmpeg",
+        "sha": "5e56937b74",
+        "hash": "9ab0457dcd6ce6359b5053c1662f57910d332f68ca0cca9d4134d858464840917027374de3d97e0863c3a7daaea2fe4f4cd17d1c6d8e7f740f4ad91e71c2932b",
+        "bundled": true
+    },
+    "ffmpeg-ci": {
+        "ci": true,
+        "package": "FFmpeg",
+        "name": "ffmpeg",
+        "repo": "crueter-ci/FFmpeg",
+        "version": "8.0.1-5e56937b74",
+        "min_version": "4.1"
+    }
+}

externals/libusb/CMakeLists.txt

@@ -4,6 +4,8 @@
 # SPDX-FileCopyrightText: 2020 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+include(CPMUtil)
+
 AddJsonPackage(libusb)
 
 if (NOT libusb_ADDED)

externals/libusb/cpmfile.json

@@ -0,0 +1,12 @@
+{
+    "libusb": {
+        "repo": "libusb/libusb",
+        "tag": "v%VERSION%",
+        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
+        "find_args": "MODULE",
+        "git_version": "1.0.29",
+        "patches": [
+            "0001-netbsd-gettime.patch"
+        ]
+    }
+}

externals/nx_tzdb/CMakeLists.txt

@@ -4,6 +4,8 @@
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+include(CPMUtil)
+
 set(NX_TZDB_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
 
 add_library(nx_tzdb INTERFACE)

externals/nx_tzdb/cpmfile.json

@@ -0,0 +1,11 @@
+{
+    "tzdb": {
+        "package": "nx_tzdb",
+        "repo": "misc/tzdb_to_nx",
+        "git_host": "git.crueter.xyz",
+        "artifact": "%VERSION%.tar.gz",
+        "tag": "%VERSION%",
+        "hash": "dc37a189a44ce8b5c988ca550582431a6c7eadfd3c6e709bee6277116ee803e714333e85c9e6cbb5c69346a14d6f2cc7ed96e8aa09cc5fb8a89f945059651db6",
+        "version": "121125"
+    }
+}

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 # SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
@@ -7,7 +7,8 @@
 include_directories(.)
 
 # Dynarmic
-if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
+if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64))
+    set(DYNARMIC_IGNORE_ASSERTS ON)
     add_subdirectory(dynarmic)
     add_library(dynarmic::dynarmic ALIAS dynarmic)
 endif()
@@ -16,10 +17,6 @@ endif()
 set_property(DIRECTORY APPEND PROPERTY
     COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
 
-if (YUZU_STATIC_BUILD)
-    add_compile_definitions(QT_STATICPLUGIN)
-endif()
-
 # Set compilation flags
 if (MSVC AND NOT CXX_CLANG)
     set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
@@ -173,18 +170,25 @@ else()
         add_compile_definitions(_FILE_OFFSET_BITS=64)
     endif()
 
-    if (YUZU_STATIC_BUILD AND NOT APPLE)
-        add_compile_options(-static)
+    if (YUZU_STATIC_BUILD)
+        add_compile_definitions(QT_STATICPLUGIN)
 
-        # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static
-        add_link_options(-Wl,-Bstatic -static -lpthread)
-        add_link_options(-static-libgcc -static-libstdc++)
+        # macos doesn't even let you make static executables... wtf?
+        if (NOT APPLE)
+            add_compile_options(-static)
+            if (YUZU_STATIC_BUILD)
+                # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static
+                # At a guess, it's probably because Qt handles the Qt executable for us, whereas this does not
+                add_link_options(-static -lpthread)
+                add_link_options(-static-libgcc -static-libstdc++)
+            endif()
+        endif()
     endif()
 
     if (MINGW)
         add_compile_definitions(MINGW_HAS_SECURE_API)
 
-        # Only windows has this requirement
+        # Only windows has this requirement, thanks windows
         if (WIN32 AND ARCHITECTURE_x86_64)
             add_compile_options("-msse4.1")
         endif()

src/android/app/build.gradle.kts

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright yuzu/Citra Emulator Project
@@ -112,9 +112,6 @@ android {
         }
     }
 
-    // The app name is constructed with the appNameSuffix and appNameBase manifest placeholders
-    // suffix is used for build type--remember to include a space beforehand
-
     // Define build types, which are orthogonal to product flavors.
     buildTypes {
         // Signed by release key, allowing for upload to Play Store.
@@ -125,8 +122,6 @@ android {
                 signingConfigs.getByName("default")
             }
 
-            manifestPlaceholders += mapOf("appNameSuffix" to "")
-
             isMinifyEnabled = true
             isDebuggable = false
             proguardFiles(
@@ -145,9 +140,6 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-
-            manifestPlaceholders += mapOf("appNameSuffix" to " Debug Release")
-
             versionNameSuffix = "-relWithDebInfo"
             applicationIdSuffix = ".relWithDebInfo"
             isJniDebuggable = true
@@ -161,20 +153,13 @@ android {
             isJniDebuggable = true
             versionNameSuffix = "-debug"
             applicationIdSuffix = ".debug"
-
-            manifestPlaceholders += mapOf("appNameSuffix" to " Debug")
         }
     }
 
-    // appNameBase is used for the primary identifier
-    // this should be "Eden <flavorName>"
     flavorDimensions.add("version")
     productFlavors {
         create("mainline") {
             dimension = "version"
-            isDefault = true
-
-            manifestPlaceholders += mapOf("appNameBase" to "Eden")
             resValue("string", "app_name_suffixed", "Eden")
 
             ndk {
@@ -184,7 +169,6 @@ android {
 
         create("genshinSpoof") {
             dimension = "version"
-            manifestPlaceholders += mapOf("appNameBase" to "Eden Optimized")
             resValue("string", "app_name_suffixed", "Eden Optimized")
             applicationId = "com.miHoYo.Yuanshen"
 
@@ -195,7 +179,6 @@ android {
 
         create("legacy") {
             dimension = "version"
-            manifestPlaceholders += mapOf("appNameBase" to "Eden Legacy")
             resValue("string", "app_name_suffixed", "Eden Legacy")
             applicationId = "dev.legacy.eden_emulator"
 
@@ -218,8 +201,7 @@ android {
 
         create("chromeOS") {
             dimension = "version"
-            manifestPlaceholders += mapOf("appNameBase" to "Eden ChromeOS")
-            resValue("string", "app_name_suffixed", "Eden ChromeOS")
+            resValue("string", "app_name_suffixed", "Eden")
 
             ndk {
                 abiFilters += listOf("x86_64")
@@ -233,6 +215,31 @@ android {
         }
     }
 
+    // this is really annoying but idk any other ways to fix this behavior
+    applicationVariants.all {
+        val variant = this
+        when {
+            variant.flavorName == "legacy" && variant.buildType.name == "debug" -> {
+                variant.resValue("string", "app_name_suffixed", "Eden Legacy Debug")
+            }
+            variant.flavorName == "mainline" && variant.buildType.name == "debug" -> {
+                variant.resValue("string", "app_name_suffixed", "Eden Debug")
+            }
+            variant.flavorName == "genshinSpoof" && variant.buildType.name == "debug" -> {
+                variant.resValue("string", "app_name_suffixed", "Eden Optimized Debug")
+            }
+            variant.flavorName == "legacy" && variant.buildType.name == "relWithDebInfo" -> {
+                variant.resValue("string", "app_name_suffixed", "Eden Legacy Debug Release")
+            }
+            variant.flavorName == "mainline" && variant.buildType.name == "relWithDebInfo" -> {
+                variant.resValue("string", "app_name_suffixed", "Eden Debug Release")
+            }
+            variant.flavorName == "genshinSpoof" && variant.buildType.name == "relWithDebInfo" -> {
+                variant.resValue("string", "app_name_suffixed", "Eden Optimized Debug Release")
+            }
+        }
+    }
+
     externalNativeBuild {
         cmake {
             version = "3.22.1"
@@ -245,9 +252,6 @@ idea {
     module {
         // Inclusion to exclude build/ dir from non-Android
         excludeDirs.add(file("${edenDir}/build"))
-
-        // also exclude CPM cache from automatic indexing
-        excludeDirs.add(file("${edenDir}/.cache"))
     }
 }
 

src/android/app/src/main/AndroidManifest.xml

@@ -35,7 +35,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
     <application
         android:name="org.yuzu.yuzu_emu.YuzuApplication"
-        android:label="${appNameBase}${appNameSuffix}"
+        android:label="@string/app_name_suffixed"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:allowBackup="true"

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -26,7 +26,6 @@ import org.yuzu.yuzu_emu.model.InstallResult
 import org.yuzu.yuzu_emu.model.Patch
 import org.yuzu.yuzu_emu.model.GameVerificationResult
 import org.yuzu.yuzu_emu.network.NetPlayManager
-import org.yuzu.yuzu_emu.applets.web.WebBrowser
 
 /**
  * Class which contains methods that interact
@@ -201,8 +200,6 @@ object NativeLibrary {
 
     external fun logSettings()
 
-    external fun getDebugKnobAt(index: Int): Boolean
-
     /**
      * Returns Vulkan driver version / API version / GPU model
      */
@@ -458,17 +455,6 @@ object NativeLibrary {
      */
     external fun setCurrentAppletId(appletId: Int)
 
-    /**
-     * Launch external URL when Web applet and opens browser
-     *
-     * @param String URL
-     */
-    @Keep
-    @JvmStatic
-    fun openExternalUrl(url: String) {
-        WebBrowser.openExternal(url)
-    }
-
     /**
      * Sets the cabinet mode for launching the cabinet applet.
      *

src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt

@@ -61,11 +61,6 @@ class YuzuApplication : Application() {
         application = this
         documentsTree = DocumentsTree()
         DirectoryInitialization.start()
-
-        // Initialize Freedreno config BEFORE loading native library
-        // This ensures GPU driver environment variables are set before adrenotools initializes
-        GpuDriverHelper.initializeFreedrenoConfigEarly()
-
         NativeLibrary.playTimeManagerInit()
         GpuDriverHelper.initializeDriverParameters()
         NativeInput.reloadInputDevices()

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -582,7 +582,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
                         BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean() &&
                         !BooleanSetting.HIDE_OVERLAY_ON_CONTROLLER_INPUT.getBoolean()) {
                         fragment.handler.removeCallbacksAndMessages(null)
-                        fragment.toggleOverlay(true)
+                        fragment.showOverlay()
                     }
                 }
                 MotionEvent.ACTION_UP -> {

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/FreedrenoPresetAdapter.kt

@@ -1,58 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.utils.FreedrenoPreset
-import org.yuzu.yuzu_emu.databinding.ListItemFreedrenoPresetBinding
-
-/**
- * Adapter for displaying Freedreno preset configurations in a horizontal list.
- */
-class FreedrenoPresetAdapter(
-    private val onPresetClicked: (FreedrenoPreset) -> Unit
-) : ListAdapter<FreedrenoPreset, FreedrenoPresetAdapter.PresetViewHolder>(DiffCallback) {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PresetViewHolder {
-        val binding = ListItemFreedrenoPresetBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
-        return PresetViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: PresetViewHolder, position: Int) {
-        holder.bind(getItem(position))
-    }
-
-    inner class PresetViewHolder(private val binding: ListItemFreedrenoPresetBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(preset: FreedrenoPreset) {
-            binding.presetButton.apply {
-                text = preset.name
-                setOnClickListener {
-                    onPresetClicked(preset)
-                }
-                contentDescription = "${preset.name}: ${preset.description}"
-            }
-        }
-    }
-
-    companion object {
-        private val DiffCallback = object : DiffUtil.ItemCallback<FreedrenoPreset>() {
-            override fun areItemsTheSame(oldItem: FreedrenoPreset, newItem: FreedrenoPreset): Boolean =
-                oldItem.name == newItem.name
-
-            override fun areContentsTheSame(oldItem: FreedrenoPreset, newItem: FreedrenoPreset): Boolean =
-                oldItem == newItem
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/FreedrenoVariableAdapter.kt

@@ -1,61 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.databinding.ListItemFreedrenoVariableBinding
-import org.yuzu.yuzu_emu.fragments.FreedrenoVariable
-import org.yuzu.yuzu_emu.utils.NativeFreedrenoConfig
-
-/**
- * Adapter for displaying currently set Freedreno environment variables in a list.
- */
-class FreedrenoVariableAdapter(
-    private val context: Context,
-    private val onItemClicked: (FreedrenoVariable, () -> Unit) -> Unit
-) : ListAdapter<FreedrenoVariable, FreedrenoVariableAdapter.VariableViewHolder>(DiffCallback) {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VariableViewHolder {
-        val binding = ListItemFreedrenoVariableBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
-        return VariableViewHolder(binding)
-    }
-
-    override fun onBindViewHolder(holder: VariableViewHolder, position: Int) {
-        holder.bind(getItem(position))
-    }
-
-    inner class VariableViewHolder(private val binding: ListItemFreedrenoVariableBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        fun bind(variable: FreedrenoVariable) {
-            binding.variableName.text = variable.name
-            binding.variableValue.text = variable.value
-
-            binding.buttonDelete.setOnClickListener {
-                onItemClicked(variable) {
-                    NativeFreedrenoConfig.clearFreedrenoEnv(variable.name)
-                }
-            }
-        }
-    }
-
-    companion object {
-        private val DiffCallback = object : DiffUtil.ItemCallback<FreedrenoVariable>() {
-            override fun areItemsTheSame(oldItem: FreedrenoVariable, newItem: FreedrenoVariable): Boolean =
-                oldItem.name == newItem.name
-
-            override fun areContentsTheSame(oldItem: FreedrenoVariable, newItem: FreedrenoVariable): Boolean =
-                oldItem == newItem
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/web/WebBrowser.kt

@@ -1,35 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.applets.web
-
-import android.content.Intent
-import android.net.Uri
-import androidx.annotation.Keep
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.utils.Log
-
-/**
-    Should run WebBrowser as a new intent.
-*/
-
-@Keep
-object WebBrowser {
-    @JvmStatic
-    fun openExternal(url: String) {
-        val activity = NativeLibrary.sEmulationActivity.get() ?: run {
-            return
-        }
-
-        activity.runOnUiThread {
-            try {
-                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-                activity.startActivity(intent)
-            } catch (e: Exception) {
-                Log.error("WebBrowser failed to launch $url: ${e.message}")
-            }
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/dialogs/QuickSettings.kt

@@ -1,208 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.dialogs
-
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.RadioGroup
-import android.widget.TextView
-import androidx.drawerlayout.widget.DrawerLayout
-import com.google.android.material.color.MaterialColors
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
-import org.yuzu.yuzu_emu.features.settings.model.IntSetting
-import org.yuzu.yuzu_emu.fragments.EmulationFragment
-import org.yuzu.yuzu_emu.utils.NativeConfig
-import org.yuzu.yuzu_emu.features.settings.model.AbstractSetting
-import org.yuzu.yuzu_emu.features.settings.model.AbstractShortSetting
-import org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting
-
-class QuickSettings(val emulationFragment: EmulationFragment) {
-    // Kinda a crappy workaround to get a title from setting keys
-    // Idk how to do this witthout hardcoding every single one
-    private fun getSettingTitle(settingKey: String): String {
-        return settingKey.replace("_", " ").split(" ")
-            .joinToString(" ") { it.replaceFirstChar { c -> c.uppercase() } }
-
-    }
-
-    private fun saveSettings() {
-        if (emulationFragment.shouldUseCustom) {
-            NativeConfig.savePerGameConfig()
-        } else {
-            NativeConfig.saveGlobalConfig()
-        }
-    }
-
-    fun addPerGameConfigStatusIndicator(container: ViewGroup) {
-        val inflater = LayoutInflater.from(emulationFragment.requireContext())
-        val statusView = inflater.inflate(R.layout.item_quick_settings_status, container, false)
-
-        val statusIcon = statusView.findViewById<android.widget.ImageView>(R.id.status_icon)
-        val statusText = statusView.findViewById<TextView>(R.id.status_text)
-
-        statusIcon.setImageResource(R.drawable.ic_settings_outline)
-        statusText.text = emulationFragment.getString(R.string.using_per_game_config)
-        statusText.setTextColor(
-            MaterialColors.getColor(
-                statusText,
-                com.google.android.material.R.attr.colorPrimary
-            )
-        )
-
-        container.addView(statusView)
-    }
-
-    // settings
-
-    fun addIntSetting(
-        container: ViewGroup,
-        setting: IntSetting,
-        namesArrayId: Int,
-        valuesArrayId: Int
-    ) {
-        val inflater = LayoutInflater.from(emulationFragment.requireContext())
-        val itemView = inflater.inflate(R.layout.item_quick_settings_menu, container, false)
-        val headerView = itemView.findViewById<ViewGroup>(R.id.setting_header)
-        val titleView = itemView.findViewById<TextView>(R.id.setting_title)
-        val valueView = itemView.findViewById<TextView>(R.id.setting_value)
-        val expandIcon = itemView.findViewById<android.widget.ImageView>(R.id.expand_icon)
-        val radioGroup = itemView.findViewById<RadioGroup>(R.id.radio_group)
-
-        titleView.text = getSettingTitle(setting.key)
-
-        val names = emulationFragment.resources.getStringArray(namesArrayId)
-        val values = emulationFragment.resources.getIntArray(valuesArrayId)
-        val currentIndex = values.indexOf(setting.getInt())
-
-        valueView.text = if (currentIndex >= 0) names[currentIndex] else "Null"
-        headerView.visibility = View.VISIBLE
-
-        var isExpanded = false
-        names.forEachIndexed { index, name ->
-            val radioButton = com.google.android.material.radiobutton.MaterialRadioButton(emulationFragment.requireContext())
-            radioButton.text = name
-            radioButton.id = View.generateViewId()
-            radioButton.isChecked = index == currentIndex
-            radioButton.setPadding(16, 8, 16, 8)
-
-            radioButton.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked) {
-                    setting.setInt(values[index])
-                    saveSettings()
-                    valueView.text = name
-                }
-            }
-            radioGroup.addView(radioButton)
-        }
-
-        headerView.setOnClickListener {
-            isExpanded = !isExpanded
-            if (isExpanded) {
-                radioGroup.visibility = View.VISIBLE
-                expandIcon.animate().rotation(180f).setDuration(200).start()
-            } else {
-                radioGroup.visibility = View.GONE
-                expandIcon.animate().rotation(0f).setDuration(200).start()
-            }
-        }
-
-        container.addView(itemView)
-    }
-
-    fun addBooleanSetting(
-        container: ViewGroup,
-        setting: BooleanSetting
-    ) {
-        val inflater = LayoutInflater.from(emulationFragment.requireContext())
-        val itemView = inflater.inflate(R.layout.item_quick_settings_menu, container, false)
-
-        val switchContainer = itemView.findViewById<ViewGroup>(R.id.switch_container)
-        val titleView = itemView.findViewById<TextView>(R.id.switch_title)
-        val switchView = itemView.findViewById<com.google.android.material.materialswitch.MaterialSwitch>(R.id.setting_switch)
-
-        titleView.text = getSettingTitle(setting.key)
-        switchContainer.visibility = View.VISIBLE
-        switchView.isChecked = setting.getBoolean()
-
-        switchView.setOnCheckedChangeListener { _, isChecked ->
-            setting.setBoolean(isChecked)
-            saveSettings()
-        }
-
-        switchContainer.setOnClickListener {
-            switchView.toggle()
-        }
-        container.addView(itemView)
-    }
-
-    fun addSliderSetting(
-        container: ViewGroup,
-        setting: AbstractSetting,
-        minValue: Int = 0,
-        maxValue: Int = 100,
-        units: String = ""
-    ) {
-        val inflater = LayoutInflater.from(emulationFragment.requireContext())
-        val itemView = inflater.inflate(R.layout.item_quick_settings_menu, container, false)
-
-        val sliderContainer = itemView.findViewById<ViewGroup>(R.id.slider_container)
-        val titleView = itemView.findViewById<TextView>(R.id.slider_title)
-        val valueDisplay = itemView.findViewById<TextView>(R.id.slider_value_display)
-        val slider = itemView.findViewById<com.google.android.material.slider.Slider>(R.id.setting_slider)
-
-
-        titleView.text = getSettingTitle(setting.key)
-        sliderContainer.visibility = View.VISIBLE
-
-        slider.valueFrom = minValue.toFloat()
-        slider.valueTo = maxValue.toFloat()
-        slider.stepSize = 1f
-        val currentValue = when (setting) {
-            is AbstractShortSetting -> setting.getShort(needsGlobal = false).toInt()
-            is AbstractIntSetting -> setting.getInt(needsGlobal = false)
-            else -> 0
-        }
-        slider.value = currentValue.toFloat().coerceIn(minValue.toFloat(), maxValue.toFloat())
-
-        val displayValue = "${slider.value.toInt()}$units"
-        valueDisplay.text = displayValue
-
-        slider.addOnChangeListener { _, value, chanhed ->
-            if (chanhed) {
-                val intValue = value.toInt()
-                when (setting) {
-                    is AbstractShortSetting -> setting.setShort(intValue.toShort())
-                    is AbstractIntSetting -> setting.setInt(intValue)
-                }
-                saveSettings()
-                valueDisplay.text = "$intValue$units"
-            }
-        }
-
-        slider.setOnTouchListener { _, event ->
-            val drawer = emulationFragment.view?.findViewById<DrawerLayout>(R.id.drawer_layout)
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    drawer?.requestDisallowInterceptTouchEvent(true)
-                }
-                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
-                    drawer?.requestDisallowInterceptTouchEvent(false)
-                }
-            }
-            false
-        }
-
-        container.addView(itemView)
-    }
-
-    fun addDivider(container: ViewGroup) {
-        val inflater = LayoutInflater.from(emulationFragment.requireContext())
-        val dividerView = inflater.inflate(R.layout.item_quick_settings_divider, container, false)
-        container.addView(dividerView)
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -16,7 +16,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     RENDERER_USE_SPEED_LIMIT("use_speed_limit"),
     USE_CUSTOM_CPU_TICKS("use_custom_cpu_ticks"),
     SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
-    FIX_BLOOM_EFFECTS("fix_bloom_effects"),
     CPUOPT_UNSAFE_HOST_MMU("cpuopt_unsafe_host_mmu"),
     USE_DOCKED_MODE("use_docked_mode"),
     USE_AUTO_STUB("use_auto_stub"),
@@ -46,8 +45,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     AIRPLANE_MODE("airplane_mode"),
 
     SHOW_SOC_OVERLAY("show_soc_overlay"),
-    SHOW_BUILD_ID("show_build_id"),
-    SHOW_DRIVER_VERSION("show_driver_version"),
     SHOW_DEVICE_MODEL("show_device_model"),
     SHOW_GPU_MODEL("show_gpu_model"),
     SHOW_SOC_MODEL("show_soc_model"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -15,6 +15,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     LANGUAGE_INDEX("language_index"),
     RENDERER_BACKEND("backend"),
     RENDERER_VRAM_USAGE_MODE("vram_usage_mode"),
+    RENDERER_SHADER_BACKEND("shader_backend"),
     RENDERER_NVDEC_EMULATION("nvdec_emulation"),
     RENDERER_ASTC_DECODE_METHOD("accelerate_astc"),
     RENDERER_ASTC_RECOMPRESSION("astc_recompression"),
@@ -46,9 +47,6 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     FAST_CPU_TIME("fast_cpu_time"),
     CPU_TICKS("cpu_ticks"),
     FAST_GPU_TIME("fast_gpu_time"),
-    GPU_UNSWIZZLE_TEXTURE_SIZE("gpu_unswizzle_texture_size"),
-    GPU_UNSWIZZLE_STREAM_SIZE("gpu_unswizzle_stream_size"),
-    GPU_UNSWIZZLE_CHUNK_SIZE("gpu_unswizzle_chunk_size"),
     BAT_TEMPERATURE_UNIT("bat_temperature_unit"),
     CABINET_APPLET("cabinet_applet_mode"),
     CONTROLLER_APPLET("controller_applet_mode"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt

@@ -27,17 +27,12 @@ object Settings {
         SECTION_APP_SETTINGS(R.string.app_settings),
         SECTION_CUSTOM_PATHS(R.string.preferences_custom_paths),
         SECTION_DEBUG(R.string.preferences_debug),
-        SECTION_FREEDRENO(R.string.gpu_driver_settings),
         SECTION_APPLETS(R.string.applets_menu);
     }
 
     fun getPlayerString(player: Int): String =
         YuzuApplication.appContext.getString(R.string.preferences_player, player)
 
-    fun getDebugKnobAt(index: Int): Boolean {
-        return org.yuzu.yuzu_emu.NativeLibrary.getDebugKnobAt(index)
-    }
-
     const val PREF_FIRST_APP_LAUNCH = "FirstApplicationLaunch"
     const val PREF_SHOULD_SHOW_DRIVER_WARNING = "ShouldShowDriverWarning"
     const val PREF_MEMORY_WARNING_SHOWN = "MemoryWarningShown"

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -311,6 +311,15 @@ abstract class SettingsItem(
                     valuesId = R.array.rendererAccuracyValues
                 )
             )
+            put(
+                SingleChoiceSetting(
+                    IntSetting.RENDERER_SHADER_BACKEND,
+                    titleId = R.string.shader_backend,
+                    descriptionId = R.string.shader_backend_description,
+                    choicesId = R.array.rendererShaderNames,
+                    valuesId = R.array.rendererShaderValues
+                )
+            )
             put(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_NVDEC_EMULATION,
@@ -511,20 +520,7 @@ abstract class SettingsItem(
                     valuesId = R.array.staticThemeValues
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.SHOW_BUILD_ID,
-                    titleId = R.string.show_build_id,
-                    descriptionId = 0
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.SHOW_DRIVER_VERSION,
-                    titleId = R.string.show_driver_version,
-                    descriptionId = 0
-                )
-            )
+
             put(
                 SwitchSetting(
                     BooleanSetting.SHOW_DEVICE_MODEL,
@@ -659,33 +655,6 @@ abstract class SettingsItem(
                     valuesId = R.array.gpuValues
                 )
             )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE,
-                    titleId = R.string.gpu_unswizzle_texture_size,
-                    descriptionId = R.string.gpu_unswizzle_texture_size_description,
-                    choicesId = R.array.gpuTextureSizeSwizzleEntries,
-                    valuesId = R.array.gpuTextureSizeSwizzleValues
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.GPU_UNSWIZZLE_STREAM_SIZE,
-                    titleId = R.string.gpu_unswizzle_stream_size,
-                    descriptionId = R.string.gpu_unswizzle_stream_size_description,
-                    choicesId = R.array.gpuSwizzleEntries,
-                    valuesId = R.array.gpuSwizzleValues
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE,
-                    titleId = R.string.gpu_unswizzle_chunk_size,
-                    descriptionId = R.string.gpu_unswizzle_chunk_size_description,
-                    choicesId = R.array.gpuSwizzleChunkEntries,
-                    valuesId = R.array.gpuSwizzleChunkValues
-                )
-            )
             put(
                 SingleChoiceSetting(
                     IntSetting.FAST_CPU_TIME,
@@ -719,13 +688,6 @@ abstract class SettingsItem(
                     descriptionId = R.string.skip_cpu_inner_invalidation_description
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.FIX_BLOOM_EFFECTS,
-                    titleId = R.string.fix_bloom_effects,
-                    descriptionId = R.string.fix_bloom_effects_description
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.CPUOPT_UNSAFE_HOST_MMU,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt

@@ -29,7 +29,6 @@ import org.yuzu.yuzu_emu.databinding.ListItemSettingsHeaderBinding
 import org.yuzu.yuzu_emu.features.input.NativeInput
 import org.yuzu.yuzu_emu.features.input.model.AnalogDirection
 import org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting
-import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.model.view.*
 import org.yuzu.yuzu_emu.features.settings.ui.viewholder.*
 import org.yuzu.yuzu_emu.utils.ParamPackage
@@ -213,15 +212,8 @@ class SettingsAdapter(
     }
 
     fun onSubmenuClick(item: SubmenuSetting) {
-        // Check if this is the Freedreno Settings submenu
-        if (item.menuKey == Settings.MenuTag.SECTION_FREEDRENO) {
-            fragment.view?.findNavController()?.navigate(
-                R.id.action_settingsFragment_to_freedrenoSettingsFragment
-            )
-        } else {
-            val action = SettingsNavigationDirections.actionGlobalSettingsFragment(item.menuKey, null)
-            fragment.view?.findNavController()?.navigate(action)
-        }
+        val action = SettingsNavigationDirections.actionGlobalSettingsFragment(item.menuKey, null)
+        fragment.view?.findNavController()?.navigate(action)
     }
 
     fun onLaunchableClick(item: LaunchableSetting) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.features.settings.ui
@@ -27,7 +27,6 @@ import org.yuzu.yuzu_emu.features.settings.model.Settings.MenuTag
 import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.*
-import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
@@ -110,7 +109,6 @@ class SettingsFragmentPresenter(
             MenuTag.SECTION_INPUT_PLAYER_EIGHT -> addInputPlayer(sl, 7)
             MenuTag.SECTION_APP_SETTINGS -> addThemeSettings(sl)
             MenuTag.SECTION_DEBUG -> addDebugSettings(sl)
-            MenuTag.SECTION_FREEDRENO -> addFreedrenoSettings(sl)
             MenuTag.SECTION_APPLETS -> addAppletSettings(sl)
             MenuTag.SECTION_CUSTOM_PATHS -> addCustomPathsSettings(sl)
         }
@@ -183,16 +181,6 @@ class SettingsFragmentPresenter(
                     menuKey = MenuTag.SECTION_DEBUG
                 )
             )
-            if (GpuDriverHelper.isAdrenoGpu() && !NativeConfig.isPerGameConfigLoaded()) {
-                add(
-                    SubmenuSetting(
-                        titleId = R.string.gpu_driver_settings,
-                        descriptionId = R.string.freedreno_settings_title,
-                        iconId = R.drawable.ic_graphics,
-                        menuKey = MenuTag.SECTION_FREEDRENO
-                    )
-                )
-            }
             add(
                 SubmenuSetting(
                     titleId = R.string.applets_menu,
@@ -242,11 +230,9 @@ class SettingsFragmentPresenter(
             add(BooleanSetting.USE_CUSTOM_CPU_TICKS.key)
             add(IntSetting.CPU_TICKS.key)
 
-            if (!NativeConfig.isPerGameConfigLoaded()) {
-                add(HeaderSetting(R.string.network))
-                add(StringSetting.WEB_TOKEN.key)
-                add(StringSetting.WEB_USERNAME.key)
-            }
+            add(HeaderSetting(R.string.network))
+            add(StringSetting.WEB_TOKEN.key)
+            add(StringSetting.WEB_USERNAME.key)
         }
     }
 
@@ -257,6 +243,7 @@ class SettingsFragmentPresenter(
 
             add(IntSetting.RENDERER_RESOLUTION.key)
             add(IntSetting.RENDERER_VSYNC.key)
+            add(IntSetting.RENDERER_SHADER_BACKEND.key)
             add(IntSetting.RENDERER_SCALING_FILTER.key)
             add(IntSetting.FSR_SHARPENING_SLIDER.key)
             add(IntSetting.RENDERER_ANTI_ALIASING.key)
@@ -280,11 +267,7 @@ class SettingsFragmentPresenter(
 
             add(IntSetting.FAST_GPU_TIME.key)
             add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
-            add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
-            add(IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE.key)
-            add(IntSetting.GPU_UNSWIZZLE_STREAM_SIZE.key)
-            add(IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE.key)
 
             add(HeaderSetting(R.string.extensions))
 
@@ -351,8 +334,6 @@ class SettingsFragmentPresenter(
             add(IntSetting.SOC_OVERLAY_POSITION.key)
 
             add(HeaderSetting(R.string.stats_overlay_items))
-            add(BooleanSetting.SHOW_BUILD_ID.key)
-            add(BooleanSetting.SHOW_DRIVER_VERSION.key)
             add(BooleanSetting.SHOW_DEVICE_MODEL.key)
             add(BooleanSetting.SHOW_GPU_MODEL.key)
 
@@ -517,11 +498,6 @@ class SettingsFragmentPresenter(
         }
     }
 
-    private fun addFreedrenoSettings(sl: ArrayList<SettingsItem>) {
-        // No additional settings needed here - the SubmenuSetting handles navigation
-        // This method is kept for consistency with other menu sections
-    }
-
     private fun addAppletSettings(sl: ArrayList<SettingsItem>) {
         sl.apply {
             add(IntSetting.SWKBD_APPLET.key)
@@ -1211,11 +1187,9 @@ class SettingsFragmentPresenter(
             add(SettingsItem.FASTMEM_COMBINED)
             add(BooleanSetting.CPUOPT_UNSAFE_HOST_MMU.key)
 
-            if (!NativeConfig.isPerGameConfigLoaded()) {
-                add(HeaderSetting(R.string.log))
+            add(HeaderSetting(R.string.log))
 
-                add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
-            }
+            add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key)
 
             add(HeaderSetting(R.string.general))
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverFetcherFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -45,7 +45,7 @@ class DriverFetcherFragment : Fragment() {
     private val client = OkHttpClient()
 
     private val gpuModel: String?
-        get() = GpuDriverHelper.hookLibPath?.let { GpuDriverHelper.getGpuModel(hookLibPath = it) }
+        get() = GpuDriverHelper.getGpuModel()
 
     private val adrenoModel: Int
         get() = parseAdrenoModel()
@@ -69,8 +69,7 @@ class DriverFetcherFragment : Fragment() {
         DriverRepo("Mr. Purple Turnip", "MrPurple666/purple-turnip", 0),
         DriverRepo("GameHub Adreno 8xx", "crueter/GameHub-8Elite-Drivers", 1),
         DriverRepo("KIMCHI Turnip", "K11MCH1/AdrenoToolsDrivers", 2, true, SortMode.PublishTime),
-        DriverRepo("Weab-Chan Freedreno", "Weab-chan/freedreno_turnip-CI", 3),
-        DriverRepo("Whitebelyash Turnip", "whitebelyash/freedreno_turnip-CI", sort=4, false, SortMode.PublishTime),
+        DriverRepo("Weab-Chan Freedreno", "Weab-chan/freedreno_turnip-CI", 3)
     )
 
     private val driverMap = listOf(
@@ -80,7 +79,7 @@ class DriverFetcherFragment : Fragment() {
         IntRange(600, 639) to "Mr. Purple EOL-24.3.4",
         IntRange(640, 699) to "Mr. Purple T19",
         IntRange(700, 710) to "KIMCHI 25.2.0_r5",
-        IntRange(711, 799) to "Mr. Purple T23",
+        IntRange(711, 799) to "Mr. Purple T22",
         IntRange(800, 899) to "GameHub Adreno 8xx",
         IntRange(900, Int.MAX_VALUE) to "Unsupported"
     )

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -68,14 +68,12 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.DialogOverlayAdjustBinding
 import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
-import org.yuzu.yuzu_emu.dialogs.QuickSettings
 import org.yuzu.yuzu_emu.features.input.NativeInput
 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.features.settings.model.Settings.EmulationOrientation
 import org.yuzu.yuzu_emu.features.settings.model.Settings.EmulationVerticalAlignment
-import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.EmulationViewModel
@@ -89,7 +87,6 @@ import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.NativeConfig
-import org.yuzu.yuzu_emu.utils.NativeFreedrenoConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
 import org.yuzu.yuzu_emu.utils.collect
@@ -98,7 +95,6 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
-import kotlin.or
 
 class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private lateinit var emulationState: EmulationState
@@ -108,7 +104,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private var socUpdater: (() -> Unit)? = null
 
     val handler = Handler(Looper.getMainLooper())
-
+    private var isOverlayVisible = true
     private var controllerInputReceived = false
 
     private var _binding: FragmentEmulationBinding? = null
@@ -127,8 +123,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     private lateinit var gpuModel: String
     private lateinit var fwVersion: String
-    private lateinit var buildId: String
-    private lateinit var driverInUse: String
 
     private var intentGame: Game? = null
     private var isCustomSettingsIntent = false
@@ -138,13 +132,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private var isAmiiboPickerOpen = false
     private var amiiboLoadJob: Job? = null
 
-    private var wasInputOverlayAutoHidden = false
-    private var overlayTouchActive = false
-
-    var shouldUseCustom = false
-    private var isQuickSettingsMenuOpen = false
-    private val quickSettings = QuickSettings(this)
-
     private val loadAmiiboLauncher =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
             isAmiiboPickerOpen = false
@@ -292,7 +279,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                 // Normal game launch from arguments
                 else -> {
-                    shouldUseCustom = game?.let { it == args.game && args.custom } ?: false
+                    val shouldUseCustom = game?.let { it == args.game && args.custom } ?: false
 
                     if (shouldUseCustom) {
                         SettingsFile.loadCustomConfig(game!!)
@@ -316,18 +303,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 throw fallbackException
             }
         }
-        try {
-            if (GpuDriverHelper.isAdrenoGpu()) {
-                val programIdHex = game!!.programIdHex
-                if (NativeFreedrenoConfig.loadPerGameConfigWithGlobalFallback(programIdHex)) {
-                    Log.info("[EmulationFragment] Loaded per-game Freedreno config for $programIdHex")
-                } else {
-                    Log.info("[EmulationFragment] Using global Freedreno config for $programIdHex")
-                }
-            }
-        } catch (e: Exception) {
-            Log.warning("[EmulationFragment] Failed to load Freedreno config: ${e.message}")
-        }
 
         emulationState = EmulationState(game!!.path) {
             return@EmulationState driverViewModel.isInteractionAllowed.value
@@ -641,13 +616,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
         Log.info("[EmulationFragment] Starting view setup for game: ${game?.title}")
 
-        gpuModel = GpuDriverHelper.hookLibPath?.let { GpuDriverHelper.getGpuModel(hookLibPath = it).toString() } ?: "Unknown"
+        gpuModel = GpuDriverHelper.getGpuModel().toString()
         fwVersion = NativeLibrary.firmwareVersion()
 
-        val buildVersion = NativeLibrary.getBuildVersion()
-        buildId = buildVersion.split("-").getOrNull(0) ?: ""
-        driverInUse = driverViewModel.selectedDriverVersion.value
-
         updateQuickOverlayMenuEntry(BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean())
 
         binding.surfaceEmulation.holder.addCallback(this)
@@ -672,11 +643,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 binding.inGameMenu.requestFocus()
                 emulationViewModel.setDrawerOpen(true)
                 updateQuickOverlayMenuEntry(BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean())
-                if (drawerView == binding.inGameMenu) {
-                    binding.drawerLayout.closeDrawer(binding.quickSettingsSheet)
-                } else if (drawerView == binding.quickSettingsSheet) {
-                    binding.drawerLayout.closeDrawer(binding.inGameMenu)
-                }
             }
 
             override fun onDrawerClosed(drawerView: View) {
@@ -733,7 +699,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     updateQuickOverlayMenuEntry(newState)
                     binding.surfaceInputOverlay.refreshControls()
                     // Sync view visibility with the setting
-                    toggleOverlay(newState)
+                    if (newState) {
+                        showOverlay()
+                    } else {
+                        hideOverlay()
+                    }
                     NativeConfig.saveGlobalConfig()
                     true
                 }
@@ -744,23 +714,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         Settings.MenuTag.SECTION_ROOT
                     )
                     binding.inGameMenu.requestFocus()
-                    binding.drawerLayout.closeDrawer(binding.quickSettingsSheet)
                     binding.root.findNavController().navigate(action)
                     true
                 }
 
-                R.id.menu_quick_settings -> {
-                    openQuickSettingsMenu()
-                    true
-                }
-
                 R.id.menu_settings_per_game -> {
                     val action = HomeNavigationDirections.actionGlobalSettingsActivity(
                         args.game,
                         Settings.MenuTag.SECTION_ROOT
                     )
                     binding.inGameMenu.requestFocus()
-                    binding.drawerLayout.closeDrawer(binding.quickSettingsSheet)
                     binding.root.findNavController().navigate(action)
                     true
                 }
@@ -826,36 +789,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
         }
 
-        addQuickSettings()
-
-        binding.drawerLayout.addDrawerListener(object : DrawerListener {
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                // no op
-            }
-
-            override fun onDrawerOpened(drawerView: View) {
-                if (drawerView == binding.quickSettingsSheet) {
-                    isQuickSettingsMenuOpen = true
-                    if (shouldUseCustom) {
-                        SettingsFile.loadCustomConfig(args.game!!)
-                    }
-                }
-            }
-
-            override fun onDrawerClosed(drawerView: View) {
-                if (drawerView == binding.quickSettingsSheet) {
-                    isQuickSettingsMenuOpen = false
-                    if (shouldUseCustom) {
-                        NativeConfig.unloadPerGameConfig()
-                    }
-                }
-            }
-
-            override fun onDrawerStateChanged(newState: Int) {
-                // No op
-            }
-        })
-
         setInsets()
 
         requireActivity().onBackPressedDispatcher.addCallback(
@@ -1034,73 +967,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private fun addQuickSettings() {
-        binding.quickSettingsSheet.apply {
-            val container = binding.quickSettingsSheet.findViewById<ViewGroup>(R.id.quick_settings_container)
-
-            container.removeAllViews()
-
-            if (shouldUseCustom) {
-                quickSettings.addPerGameConfigStatusIndicator(container)
-            }
-
-            quickSettings.addBooleanSetting(
-                container,
-                BooleanSetting.RENDERER_USE_SPEED_LIMIT,
-            )
-
-            quickSettings.addSliderSetting(
-                container,
-                ShortSetting.RENDERER_SPEED_LIMIT,
-                minValue = 0,
-                maxValue = 400,
-                units = "%",
-            )
-
-            quickSettings.addBooleanSetting(
-                container,
-                BooleanSetting.USE_DOCKED_MODE,
-            )
-
-            quickSettings.addDivider(container)
-
-            quickSettings.addIntSetting(
-                container,
-                IntSetting.RENDERER_ACCURACY,
-                R.array.rendererAccuracyNames,
-                R.array.rendererAccuracyValues
-            )
-
-
-            quickSettings.addIntSetting(
-                container,
-                IntSetting.RENDERER_SCALING_FILTER,
-                R.array.rendererScalingFilterNames,
-                R.array.rendererScalingFilterValues
-            )
-
-            quickSettings.addSliderSetting(
-                container,
-                IntSetting.FSR_SHARPENING_SLIDER,
-                minValue = 0,
-                maxValue = 100,
-                units = "%"
-            )
-
-            quickSettings.addIntSetting(
-                container,
-                IntSetting.RENDERER_ANTI_ALIASING,
-                R.array.rendererAntiAliasingNames,
-                R.array.rendererAntiAliasingValues
-            )
-        }
-    }
-
-    private fun openQuickSettingsMenu() {
-        binding.drawerLayout.closeDrawer(binding.inGameMenu)
-        binding.drawerLayout.openDrawer(binding.quickSettingsSheet)
-    }
-
     private fun updateQuickOverlayMenuEntry(isVisible: Boolean) {
         val b = _binding ?: return
         val item = b.inGameMenu.menu.findItem(R.id.menu_quick_overlay) ?: return
@@ -1246,7 +1112,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         super.onDestroyView()
         amiiboLoadJob?.cancel()
         amiiboLoadJob = null
-        _binding?.surfaceInputOverlay?.touchEventListener = null
         _binding = null
         isAmiiboPickerOpen = false
     }
@@ -1273,7 +1138,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         // we need to reinitialize the auto-hide timer
         initializeOverlayAutoHide()
 
-        addQuickSettings()
     }
 
     private fun resetInputOverlay() {
@@ -1287,7 +1151,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     @SuppressLint("DefaultLocale")
     private fun updateShowStatsOverlay() {
-        val showPerfOverlay = BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()
+        val showOverlay = BooleanSetting.SHOW_PERFORMANCE_OVERLAY.getBoolean()
         binding.showStatsOverlayText.apply {
             setTextColor(
                 MaterialColors.getColor(
@@ -1296,12 +1160,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 )
             )
         }
-        binding.showStatsOverlayText.setVisible(showPerfOverlay)
-        if (showPerfOverlay) {
-            //val SYSTEM_FPS = 0
+        binding.showStatsOverlayText.setVisible(showOverlay)
+        if (showOverlay) {
+            val SYSTEM_FPS = 0
             val FPS = 1
             val FRAMETIME = 2
-            //val SPEED = 3
+            val SPEED = 3
             val sb = StringBuilder()
             perfStatsUpdater = {
                 if (emulationViewModel.emulationStarted.value &&
@@ -1474,7 +1338,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     private fun updateSocOverlay() {
-        val showSOCOverlay = BooleanSetting.SHOW_SOC_OVERLAY.getBoolean()
+        val showOverlay = BooleanSetting.SHOW_SOC_OVERLAY.getBoolean()
         binding.showSocOverlayText.apply {
             setTextColor(
                 MaterialColors.getColor(
@@ -1483,48 +1347,30 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 )
             )
         }
-        binding.showSocOverlayText.setVisible(showSOCOverlay)
+        binding.showSocOverlayText.setVisible(showOverlay)
 
-        if (showSOCOverlay) {
+        if (showOverlay) {
             val sb = StringBuilder()
-            val appendWithPipe: (String) -> Unit = { text ->
-                if (text.isNotEmpty()) {
-                    if (sb.isNotEmpty()) sb.append(" | ")
-                    sb.append(text)
-                }
-            }
+
             socUpdater = {
                 if (emulationViewModel.emulationStarted.value &&
                     !emulationViewModel.isEmulationStopping.value
                 ) {
                     sb.setLength(0)
 
-                    if (BooleanSetting.SHOW_BUILD_ID.getBoolean(
-                            NativeConfig.isPerGameConfigLoaded()
-                        )
-                    ) {
-                        appendWithPipe(buildId)
-                    }
-
-                    if (BooleanSetting.SHOW_DRIVER_VERSION.getBoolean(
-                            NativeConfig.isPerGameConfigLoaded()
-                        )
-                    ) {
-                        appendWithPipe(driverInUse)
-                    }
-
                     if (BooleanSetting.SHOW_DEVICE_MODEL.getBoolean(
                             NativeConfig.isPerGameConfigLoaded()
                         )
                     ) {
-                        appendWithPipe(Build.MODEL)
+                        sb.append(Build.MODEL)
                     }
 
                     if (BooleanSetting.SHOW_GPU_MODEL.getBoolean(
                             NativeConfig.isPerGameConfigLoaded()
                         )
                     ) {
-                        appendWithPipe(gpuModel)
+                        if (sb.isNotEmpty()) sb.append(" | ")
+                        sb.append(gpuModel)
                     }
 
                     if (Build.VERSION.SDK_INT >= 31) {
@@ -1532,7 +1378,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                                 NativeConfig.isPerGameConfigLoaded()
                             )
                         ) {
-                            appendWithPipe(Build.SOC_MODEL)
+                            if (sb.isNotEmpty()) sb.append(" | ")
+                            sb.append(Build.SOC_MODEL)
                         }
                     }
 
@@ -1540,7 +1387,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                             NativeConfig.isPerGameConfigLoaded()
                         )
                     ) {
-                        appendWithPipe(fwVersion)
+                        if (sb.isNotEmpty()) sb.append(" | ")
+                        sb.append(fwVersion)
                     }
 
                     binding.showSocOverlayText.text = sb.toString()
@@ -1813,7 +1661,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                 R.id.menu_show_overlay -> {
                     it.isChecked = !it.isChecked
-                    toggleOverlay(it.isChecked)
+                    BooleanSetting.SHOW_INPUT_OVERLAY.setBoolean(it.isChecked)
+                    updateQuickOverlayMenuEntry(it.isChecked)
+                    binding.surfaceInputOverlay.refreshControls()
                     true
                 }
 
@@ -1948,26 +1798,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
             windowInsets
         }
-
-        ViewCompat.setOnApplyWindowInsetsListener(binding.quickSettingsSheet) { v, insets ->
-            val systemBarsInsets: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-           if (v.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
-                v.setPadding(
-                    systemBarsInsets.left,
-                    systemBarsInsets.top,
-                    0,
-                    systemBarsInsets.bottom
-                )
-            } else {
-                v.setPadding(
-                    0,
-                    systemBarsInsets.top,
-                    systemBarsInsets.right,
-                    systemBarsInsets.bottom
-                )
-            }
-            insets
-        }
     }
 
     private class EmulationState(
@@ -2157,87 +1987,68 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     private fun startOverlayAutoHideTimer(seconds: Int) {
         handler.removeCallbacksAndMessages(null)
-        val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
 
         handler.postDelayed({
-            if (showInputOverlay && isAdded && _binding != null) {
-                if (overlayTouchActive) {
-                    startOverlayAutoHideTimer(seconds)
-                } else {
-                    autoHideOverlay()
-                }
+            if (isOverlayVisible && isAdded && _binding != null) {
+                hideOverlay()
             }
         }, seconds * 1000L)
     }
 
     fun handleScreenTap(isLongTap: Boolean) {
-        if (!isAdded || _binding == null) return
-        if (binding.surfaceInputOverlay.isGamelessMode()) return
-        if (!BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean()) return
-        // failsafe
-        val autoHideSeconds = IntSetting.INPUT_OVERLAY_AUTO_HIDE.getInt()
-        if (autoHideSeconds == 0) {
-            toggleOverlay(true)
-        } else {
-            val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
-            if (!showInputOverlay && !isLongTap && wasInputOverlayAutoHidden) {
-                toggleOverlay(true)
-            }
-            startOverlayAutoHideTimer(autoHideSeconds)
+        if (binding.surfaceInputOverlay.isGamelessMode()) {
+            return
         }
+
+        val autoHideSeconds = IntSetting.INPUT_OVERLAY_AUTO_HIDE.getInt()
+        val shouldProceed = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean() && BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean()
+
+        if (!shouldProceed) {
+            return
+        }
+
+        // failsafe
+        if (autoHideSeconds == 0) {
+            showOverlay()
+            return
+        }
+
+        if (!isOverlayVisible && !isLongTap) {
+            showOverlay()
+        }
+
+        startOverlayAutoHideTimer(autoHideSeconds)
     }
 
     private fun initializeOverlayAutoHide() {
-        if (!isAdded || _binding == null) return
-        if (binding.surfaceInputOverlay.isGamelessMode()) return
+        if (binding.surfaceInputOverlay.isGamelessMode()) {
+            return
+        }
 
         val autoHideSeconds = IntSetting.INPUT_OVERLAY_AUTO_HIDE.getInt()
         val autoHideEnabled = BooleanSetting.ENABLE_INPUT_OVERLAY_AUTO_HIDE.getBoolean()
-        val showInputOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
-        if (autoHideEnabled && showInputOverlay) {
-            toggleOverlay(true)
+        val showOverlay = BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
+
+        if (autoHideEnabled && showOverlay) {
+            showOverlay()
             startOverlayAutoHideTimer(autoHideSeconds)
         }
+    }
 
-        binding.surfaceInputOverlay.touchEventListener = { event ->
-            when (event.actionMasked) {
-                MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
-                    overlayTouchActive = true
-                    handler.removeCallbacksAndMessages(null)
-                }
-                MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> {
-                    overlayTouchActive = event.pointerCount > 1
-                    if (!overlayTouchActive) handleScreenTap(isLongTap = false)
-                }
-                MotionEvent.ACTION_CANCEL -> {
-                    overlayTouchActive = false
-                    handleScreenTap(isLongTap = false)
-                }
-                MotionEvent.ACTION_MOVE -> {
-                    overlayTouchActive = true
-                }
-            }
+
+    fun showOverlay() {
+        if (!isOverlayVisible) {
+            isOverlayVisible = true
+            // Reset controller input flag so controller can hide overlay again
+            controllerInputReceived = false
+            ViewUtils.showView(binding.surfaceInputOverlay, 500)
         }
     }
 
-    private fun autoHideOverlay() {
-        toggleOverlay(false)
-        wasInputOverlayAutoHidden = true
-    }
-
-    fun toggleOverlay(enable: Boolean) {
-        if (!isAdded || _binding == null) return
-        if (enable == !BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) {
-            // Reset controller input flag so controller can hide overlay again
-            if (!enable) {
-                controllerInputReceived = false
-            }
-            if (enable) {
-                wasInputOverlayAutoHidden = false
-            }
-            BooleanSetting.SHOW_INPUT_OVERLAY.setBoolean(enable)
-            updateQuickOverlayMenuEntry(enable)
-            binding.surfaceInputOverlay.refreshControls()
+    private fun hideOverlay() {
+        if (isOverlayVisible) {
+            isOverlayVisible = false
+            ViewUtils.hideView(binding.surfaceInputOverlay)
         }
     }
 
@@ -2246,7 +2057,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         if (!BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) return
         if (controllerInputReceived) return
         controllerInputReceived = true
-        autoHideOverlay()
+        hideOverlay()
     }
 
     fun onControllerConnected() {
@@ -2257,6 +2068,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         if (!BooleanSetting.HIDE_OVERLAY_ON_CONTROLLER_INPUT.getBoolean()) return
         if (!BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) return
         controllerInputReceived = false
-        toggleOverlay(true)
+        showOverlay()
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/FreedrenoSettingsFragment.kt

@@ -1,204 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.navArgs
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.FreedrenoPresetAdapter
-import org.yuzu.yuzu_emu.adapters.FreedrenoVariableAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentFreedrenoSettingsBinding
-import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.utils.NativeFreedrenoConfig
-import org.yuzu.yuzu_emu.utils.FreedrenoPresets
-
-
-class FreedrenoSettingsFragment : Fragment() {
-    private var _binding: FragmentFreedrenoSettingsBinding? = null
-    private val binding get() = _binding!!
-    private val args by navArgs<FreedrenoSettingsFragmentArgs>()
-    private val game: Game? get() = args.game
-    private val isPerGameConfig: Boolean get() = game != null
-
-    private lateinit var presetAdapter: FreedrenoPresetAdapter
-    private lateinit var settingsAdapter: FreedrenoVariableAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentFreedrenoSettingsBinding.inflate(layoutInflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        NativeFreedrenoConfig.setFreedrenoBasePath(requireContext().cacheDir.absolutePath)
-        NativeFreedrenoConfig.initializeFreedrenoConfig()
-
-        if (isPerGameConfig) {
-            NativeFreedrenoConfig.loadPerGameConfig(game!!.programIdHex)
-        } else {
-            NativeFreedrenoConfig.reloadFreedrenoConfig()
-        }
-
-        setupToolbar()
-        setupAdapters()
-        loadCurrentSettings()
-        setupButtonListeners()
-        setupWindowInsets()
-    }
-
-    private fun setupToolbar() {
-        binding.toolbarFreedreno.setNavigationOnClickListener {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        }
-        if (isPerGameConfig) {
-            binding.toolbarFreedreno.title = getString(R.string.freedreno_per_game_title)
-            binding.toolbarFreedreno.subtitle = game!!.title
-        }
-    }
-
-    private fun setupAdapters() {
-        // Setup presets adapter (horizontal list)
-        presetAdapter = FreedrenoPresetAdapter { preset ->
-            applyPreset(preset)
-        }
-        binding.listFreedrenoPresets.apply {
-            adapter = presetAdapter
-            layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
-        }
-        presetAdapter.submitList(FreedrenoPresets.ALL_PRESETS)
-
-        // Setup current settings adapter (vertical list)
-        settingsAdapter = FreedrenoVariableAdapter(requireContext()) { variable, onDelete ->
-            onDelete()
-            loadCurrentSettings() // Refresh list after deletion
-        }
-        binding.listFreedrenoSettings.apply {
-            adapter = settingsAdapter
-            layoutManager = LinearLayoutManager(requireContext())
-        }
-    }
-
-    private fun loadCurrentSettings() {
-        // Load all currently set environment variables
-        val variables = mutableListOf<FreedrenoVariable>()
-
-        // Common variables to check
-        val commonVars = listOf(
-            "TU_DEBUG", "FD_MESA_DEBUG", "IR3_SHADER_DEBUG",
-            "FD_RD_DUMP", "FD_RD_DUMP_FRAMES", "FD_RD_DUMP_TESTNAME",
-            "TU_BREADCRUMBS"
-        )
-
-        for (varName in commonVars) {
-            if (NativeFreedrenoConfig.isFreedrenoEnvSet(varName)) {
-                val value = NativeFreedrenoConfig.getFreedrenoEnv(varName)
-                variables.add(FreedrenoVariable(varName, value))
-            }
-        }
-
-        settingsAdapter.submitList(variables)
-    }
-
-    private fun setupButtonListeners() {
-        binding.buttonAddVariable.setOnClickListener {
-            val varName = binding.variableNameInput.text.toString().trim()
-            val varValue = binding.variableValueInput.text.toString().trim()
-
-            if (varName.isEmpty()) {
-                showSnackbar(getString(R.string.freedreno_error_empty_name))
-                return@setOnClickListener
-            }
-
-            if (NativeFreedrenoConfig.setFreedrenoEnv(varName, varValue)) {
-                showSnackbar(getString(R.string.freedreno_variable_added, varName))
-                binding.variableNameInput.text?.clear()
-                binding.variableValueInput.text?.clear()
-                loadCurrentSettings()
-            } else {
-                showSnackbar(getString(R.string.freedreno_error_setting_variable))
-            }
-        }
-
-        binding.buttonClearAll.setOnClickListener {
-            NativeFreedrenoConfig.clearAllFreedrenoEnv()
-            showSnackbar(getString(R.string.freedreno_cleared_all))
-            loadCurrentSettings()
-        }
-
-        binding.buttonSave.setOnClickListener {
-            if (isPerGameConfig) {
-                NativeFreedrenoConfig.savePerGameConfig(game!!.programIdHex)
-                showSnackbar(getString(R.string.freedreno_per_game_saved))
-            } else {
-                NativeFreedrenoConfig.saveFreedrenoConfig()
-                showSnackbar(getString(R.string.freedreno_saved))
-            }
-        }
-    }
-
-    private fun applyPreset(preset: org.yuzu.yuzu_emu.utils.FreedrenoPreset) {
-        // Clear all first for consistency
-        NativeFreedrenoConfig.clearAllFreedrenoEnv()
-
-        // Apply all variables in the preset
-        for ((varName, varValue) in preset.variables) {
-            NativeFreedrenoConfig.setFreedrenoEnv(varName, varValue)
-        }
-
-        showSnackbar(getString(R.string.freedreno_preset_applied, preset.name))
-        loadCurrentSettings()
-    }
-
-    private fun setupWindowInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, insets ->
-            val systemInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            binding.root.updatePadding(
-                left = systemInsets.left,
-                right = systemInsets.right,
-                bottom = systemInsets.bottom
-            )
-            insets
-        }
-    }
-
-    private fun showSnackbar(message: String) {
-        Snackbar.make(binding.root, message, Snackbar.LENGTH_SHORT).show()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
-
-/**
- * Data class representing a Freedreno environment variable.
- */
-data class FreedrenoVariable(
-    val name: String,
-    val value: String
-)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt

@@ -325,20 +325,6 @@ class GamePropertiesFragment : Fragment() {
                     )
                 )
             }
-            if (GpuDriverHelper.isAdrenoGpu()) {
-                add(
-                    SubmenuProperty(
-                        R.string.freedreno_per_game_title,
-                        R.string.freedreno_per_game_description,
-                        R.drawable.ic_graphics,
-                        action = {
-                            val action = GamePropertiesFragmentDirections
-                                .actionPerGamePropertiesFragmentToFreedrenoSettingsFragment(args.game)
-                            binding.root.findNavController().navigate(action)
-                        }
-                    )
-                )
-            }
 
             if (!args.game.isHomebrew) {
                 add(

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt

@@ -1,6 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 package org.yuzu.yuzu_emu.model
 
 import androidx.lifecycle.ViewModel
@@ -21,7 +24,6 @@ import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.Driver.Companion.toDriver
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.utils.GpuDriverMetadata
 import org.yuzu.yuzu_emu.utils.NativeConfig
 import java.io.File
@@ -49,9 +51,6 @@ class DriverViewModel : ViewModel() {
     private val _selectedDriverTitle = MutableStateFlow("")
     val selectedDriverTitle: StateFlow<String> get() = _selectedDriverTitle
 
-    private val _selectedDriverVersion = MutableStateFlow("")
-    val selectedDriverVersion: StateFlow<String> get() = _selectedDriverVersion
-
     private val _showClearButton = MutableStateFlow(false)
     val showClearButton = _showClearButton.asStateFlow()
 
@@ -78,13 +77,11 @@ class DriverViewModel : ViewModel() {
     fun updateDriverList() {
         val selectedDriver = GpuDriverHelper.customDriverSettingData
         val systemDriverData = GpuDriverHelper.getSystemDriverInfo()
-        val systemDriverTitle = YuzuApplication.appContext.getString(R.string.system_gpu_driver)
         val newDriverList = mutableListOf(
             Driver(
                 selectedDriver == GpuDriverMetadata(),
-                systemDriverTitle,
-                //systemDriverData?.get(0) ?: "",
-                NativeLibrary.getVulkanDriverVersion().takeIf { !it.isNullOrEmpty() } ?: systemDriverTitle,
+                YuzuApplication.appContext.getString(R.string.system_gpu_driver),
+                systemDriverData?.get(0) ?: "",
                 systemDriverData?.get(1) ?: ""
             )
         )
@@ -236,15 +233,8 @@ class DriverViewModel : ViewModel() {
     }
 
     private fun updateName() {
-        val systemDriverTitle = YuzuApplication.appContext.getString(R.string.system_gpu_driver)
-        //val systemDriverVersion = GpuDriverHelper.getSystemDriverInfo()?.get(0) ?: systemDriverTitle //title as fallback just in case
-        val systemDriverVersion = NativeLibrary.getVulkanDriverVersion().takeIf { !it.isNullOrEmpty() } ?: systemDriverTitle
-        val customDriver = GpuDriverHelper.customDriverSettingData
-
-        _selectedDriverTitle.value = customDriver.name
-            ?: systemDriverTitle
-        _selectedDriverVersion.value = customDriver.version
-            ?: systemDriverVersion
+        _selectedDriverTitle.value = GpuDriverHelper.customDriverSettingData.name
+            ?: YuzuApplication.appContext.getString(R.string.system_gpu_driver)
     }
 
     private fun setDriverReady() {

src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt

@@ -73,9 +73,6 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
 
     var layout = OverlayLayout.Landscape
 
-    // External listener for EmulationFragment joypad overlay auto-hide
-    var touchEventListener: ((MotionEvent) -> Unit)? = null
-
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
 
@@ -141,10 +138,6 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
     }
 
     override fun onTouch(v: View, event: MotionEvent): Boolean {
-        try {
-            touchEventListener?.invoke(event)
-        } catch (e: Exception) {}
-
         if (inEditMode) {
             return onTouchWhileEditing(event)
         }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt

@@ -23,16 +23,10 @@ object GpuDriverHelper {
     private const val META_JSON_FILENAME = "meta.json"
     private var fileRedirectionPath: String? = null
     var driverInstallationPath: String? = null
-    internal var hookLibPath: String? = null
+    private var hookLibPath: String? = null
 
     val driverStoragePath get() = DirectoryInitialization.userDirectory!! + "/gpu_drivers/"
 
-    fun initializeFreedrenoConfigEarly() {
-        NativeFreedrenoConfig.setFreedrenoBasePath(YuzuApplication.appContext.cacheDir.absolutePath)
-        NativeFreedrenoConfig.initializeFreedrenoConfig()
-        NativeFreedrenoConfig.reloadFreedrenoConfig()
-    }
-
     fun initializeDriverParameters() {
         try {
             // Initialize the file redirection directory.
@@ -46,9 +40,11 @@ object GpuDriverHelper {
             throw RuntimeException(e)
         }
 
+        // Initialize directories.
         initializeDirectories()
+
+        // Initialize hook libraries directory.
         hookLibPath = YuzuApplication.appContext.applicationInfo.nativeLibraryDir + "/"
-        NativeFreedrenoConfig.reloadFreedrenoConfig()
 
         // Initialize GPU driver.
         NativeLibrary.initializeGpuDriver(
@@ -215,17 +211,9 @@ object GpuDriverHelper {
 
     external fun getGpuModel(
         surface: Surface = Surface(SurfaceTexture(true)),
-        hookLibPath: String
+        hookLibPath: String = GpuDriverHelper.hookLibPath!!
     ): String?
 
-    fun isAdrenoGpu(): Boolean {
-        return try {
-            supportsCustomDriverLoading()
-        } catch (e: Exception) {
-            false
-        }
-    }
-
     // Parse the custom driver metadata to retrieve the name.
     val installedCustomDriverData: GpuDriverMetadata
         get() = GpuDriverMetadata(File(driverInstallationPath + META_JSON_FILENAME))

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeFreedrenoConfig.kt

@@ -1,164 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.utils
-
-/**
- * Provides access to Freedreno/Turnip driver configuration through JNI bindings.
- *
- * This class allows Java/Kotlin code to configure Freedreno environment variables
- * for the GPU driver (Turnip/Freedreno) that runs in the emulator on Android.
- *
- * Variables must be set BEFORE starting emulation for them to take effect.
- *
- * See https://docs.mesa3d.org/drivers/freedreno.html for documentation.
- */
-object NativeFreedrenoConfig {
-
-    @Synchronized
-    external fun setFreedrenoBasePath(basePath: String)
-
-    @Synchronized
-    external fun initializeFreedrenoConfig()
-
-    @Synchronized
-    external fun saveFreedrenoConfig()
-
-    @Synchronized
-    external fun reloadFreedrenoConfig()
-
-    @Synchronized
-    external fun setFreedrenoEnv(varName: String, value: String): Boolean
-
-    @Synchronized
-    external fun getFreedrenoEnv(varName: String): String
-
-    @Synchronized
-    external fun isFreedrenoEnvSet(varName: String): Boolean
-
-    @Synchronized
-    external fun clearFreedrenoEnv(varName: String): Boolean
-
-    @Synchronized
-    external fun clearAllFreedrenoEnv()
-
-    @Synchronized
-    external fun getFreedrenoEnvSummary(): String
-
-    @Synchronized
-    external fun setCurrentProgramId(programId: String)
-
-    @Synchronized
-    external fun loadPerGameConfig(programId: String): Boolean
-
-    @Synchronized
-    external fun loadPerGameConfigWithGlobalFallback(programId: String): Boolean
-
-    @Synchronized
-    external fun savePerGameConfig(programId: String): Boolean
-
-    @Synchronized
-    external fun hasPerGameConfig(programId: String): Boolean
-
-    @Synchronized
-    external fun deletePerGameConfig(programId: String): Boolean
-}
-
-/**
- * Data class representing a Freedreno preset configuration.
- * Presets are commonly used debugging/profiling configurations.
- */
-data class FreedrenoPreset(
-    val name: String,           // Display name (e.g., "Debug - CPU Memory")
-    val description: String,    // Description of what this preset does
-    val icon: String,           // Icon identifier
-    val variables: Map<String, String> // Map of env vars to set
-)
-
-/**
- * Predefined Freedreno presets for quick configuration.
- */
-object FreedrenoPresets {
-
-    val DEBUG_CPU_MEMORY = FreedrenoPreset(
-        name = "Debug - CPU Memory",
-        description = "Use CPU memory (slower but more stable)",
-        icon = "ic_debug_cpu",
-        variables = mapOf(
-            "TU_DEBUG" to "sysmem"
-        )
-    )
-
-    val DEBUG_UBWC_DISABLED = FreedrenoPreset(
-        name = "Debug - No UBWC",
-        description = "Disable UBWC compression for debugging",
-        icon = "ic_debug_ubwc",
-        variables = mapOf(
-            "TU_DEBUG" to "noubwc"
-        )
-    )
-
-    val DEBUG_NO_BINNING = FreedrenoPreset(
-        name = "Debug - No Binning",
-        description = "Disable binning optimization",
-        icon = "ic_debug_bin",
-        variables = mapOf(
-            "TU_DEBUG" to "nobin"
-        )
-    )
-
-    val CAPTURE_RENDERPASS = FreedrenoPreset(
-        name = "Capture - Renderpass",
-        description = "Capture command stream data for debugging",
-        icon = "ic_capture",
-        variables = mapOf(
-            "FD_RD_DUMP" to "enable"
-        )
-    )
-
-    val CAPTURE_FRAMES = FreedrenoPreset(
-        name = "Capture - First 100 Frames",
-        description = "Capture command stream for first 100 frames only",
-        icon = "ic_capture",
-        variables = mapOf(
-            "FD_RD_DUMP" to "enable",
-            "FD_RD_DUMP_FRAMES" to "0-100"
-        )
-    )
-
-    val SHADER_DEBUG = FreedrenoPreset(
-        name = "Shader Debug",
-        description = "Enable IR3 shader compiler debugging",
-        icon = "ic_shader",
-        variables = mapOf(
-            "IR3_SHADER_DEBUG" to "nouboopt,spillall"
-        )
-    )
-
-    val GPU_HANG_TRACE = FreedrenoPreset(
-        name = "GPU Hang Trace",
-        description = "Trace GPU progress for debugging hangs",
-        icon = "ic_hang_trace",
-        variables = mapOf(
-            "TU_BREADCRUMBS" to "1"
-        )
-    )
-
-    val PERFORMANCE_DEFAULT = FreedrenoPreset(
-        name = "Performance - Default",
-        description = "Clear all debug options for performance",
-        icon = "ic_performance",
-        variables = emptyMap()  // Clears all when applied
-    )
-
-    val ALL_PRESETS = listOf(
-        DEBUG_CPU_MEMORY,
-        DEBUG_UBWC_DISABLED,
-        DEBUG_NO_BINNING,
-        CAPTURE_RENDERPASS,
-        CAPTURE_FRAMES,
-        SHADER_DEBUG,
-        GPU_HANG_TRACE,
-        PERFORMANCE_DEFAULT
-    )
-}

src/android/app/src/main/jni/CMakeLists.txt

@@ -10,7 +10,6 @@ add_library(yuzu-android SHARED
     native.cpp
     native.h
     native_config.cpp
-    native_freedreno.cpp
     android_settings.cpp
     game_metadata.cpp
     native_log.cpp

src/android/app/src/main/jni/android_settings.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -160,14 +160,7 @@ namespace AndroidSettings {
         Settings::Setting<bool> show_soc_overlay{linkage, true, "show_soc_overlay",
                                                  Settings::Category::Overlay,
                                                  Settings::Specialization::Paired, true, true};
-        Settings::Setting<bool> show_build_id{linkage, true, "show_build_id",
-                                                  Settings::Category::Overlay,
-                                                  Settings::Specialization::Default, true, true,
-                                                  &show_performance_overlay};
-        Settings::Setting<bool> show_driver_version{linkage, true, "show_driver_version",
-                                                  Settings::Category::Overlay,
-                                                  Settings::Specialization::Default, true, true,
-                                                  &show_performance_overlay};
+
         Settings::Setting<bool> show_device_model{linkage, true, "show_device_model",
                                                   Settings::Category::Overlay,
                                                   Settings::Specialization::Default, true, true,

src/android/app/src/main/jni/native.cpp

@@ -66,7 +66,6 @@
 #include "core/frontend/applets/profile_select.h"
 #include "core/frontend/applets/software_keyboard.h"
 #include "core/frontend/applets/web_browser.h"
-#include "common/android/applets/web_browser.h"
 #include "core/hle/service/am/applet_manager.h"
 #include "core/hle/service/am/frontend/applets.h"
 #include "core/hle/service/filesystem/filesystem.h"
@@ -276,7 +275,6 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
 
     // Initialize system.
     jauto android_keyboard = std::make_unique<Common::Android::SoftwareKeyboard::AndroidKeyboard>();
-    jauto android_webapplet = std::make_unique<Common::Android::WebBrowser::AndroidWebBrowser>();
     m_software_keyboard = android_keyboard.get();
     m_system.SetShuttingDown(false);
     m_system.ApplySettings();
@@ -291,7 +289,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
         nullptr,                     // Photo Viewer
         nullptr,                     // Profile Selector
         std::move(android_keyboard), // Software Keyboard
-        std::move(android_webapplet),// Web Browser
+        nullptr,                     // Web Browser
         nullptr,                     // Net Connect
     });
 
@@ -732,28 +730,11 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* en
     return false;
 }
 
-void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env,
-                                                                       [[maybe_unused]] jclass clazz,
+void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
                                                                        jstring hook_lib_dir,
                                                                        jstring custom_driver_dir,
                                                                        jstring custom_driver_name,
                                                                        jstring file_redirect_dir) {
-    // Log active Freedreno environment variables
-    const char* tu_debug = getenv("TU_DEBUG");
-    const char* fd_debug = getenv("FD_MESA_DEBUG");
-    const char* ir3_debug = getenv("IR3_SHADER_DEBUG");
-    const char* fd_rd_dump = getenv("FD_RD_DUMP");
-    const char* tu_breadcrumbs = getenv("TU_BREADCRUMBS");
-
-    if (tu_debug || fd_debug || ir3_debug || fd_rd_dump || tu_breadcrumbs) {
-        LOG_INFO(Frontend, "[Freedreno] Initializing GPU driver with configuration:");
-        if (tu_debug) LOG_INFO(Frontend, "[Freedreno]   TU_DEBUG={}", tu_debug);
-        if (fd_debug) LOG_INFO(Frontend, "[Freedreno]   FD_MESA_DEBUG={}", fd_debug);
-        if (ir3_debug) LOG_INFO(Frontend, "[Freedreno]   IR3_SHADER_DEBUG={}", ir3_debug);
-        if (fd_rd_dump) LOG_INFO(Frontend, "[Freedreno]   FD_RD_DUMP={}", fd_rd_dump);
-        if (tu_breadcrumbs) LOG_INFO(Frontend, "[Freedreno]   TU_BREADCRUMBS={}", tu_breadcrumbs);
-    }
-
     EmulationSession::GetInstance().InitializeGpuDriver(
         Common::Android::GetJString(env, hook_lib_dir),
         Common::Android::GetJString(env, custom_driver_dir),
@@ -1132,10 +1113,6 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_logSettings(JNIEnv* env, jobject jobj
     Settings::LogSettings();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_getDebugKnobAt(JNIEnv* env, jobject jobj, jint index) {
-    return static_cast<jboolean>(Settings::getDebugKnobAt(static_cast<u8>(index)));
-}
-
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_run(JNIEnv* env, jobject jobj, jstring j_path,
                                                jint j_program_index,
                                                jboolean j_frontend_initiated) {

src/android/app/src/main/jni/native_freedreno.cpp

@@ -1,477 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-/**
- * @file native_freedreno.cpp
- * @brief JNI bindings for Freedreno/Turnip GPU driver configuration.
- *
- * Provides runtime configuration of Mesa Freedreno environment variables
- * for the Turnip Vulkan driver on Adreno GPUs.
- *
- * @see https://docs.mesa3d.org/drivers/freedreno.html
- */
-
-#include <algorithm>
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <map>
-#include <memory>
-#include <string>
-#include <sys/stat.h>
-
-#include <jni.h>
-
-#include "common/android/android_common.h"
-#include "common/logging/log.h"
-#include "native.h"
-
-namespace {
-
-struct FreedrenoConfig {
-    std::map<std::string, std::string> env_vars;
-    std::string config_file_path;
-};
-
-std::unique_ptr<FreedrenoConfig> g_config;
-std::string g_base_path;
-std::string g_current_program_id;
-
-constexpr const char* kConfigFileName = ".freedreno.conf";
-constexpr const char* kPerGameConfigDir = "freedreno_games";
-
-void LogActiveVariables() {
-    if (!g_config || g_config->env_vars.empty()) {
-        return;
-    }
-    for (const auto& [key, value] : g_config->env_vars) {
-        LOG_INFO(Frontend, "[Freedreno] {}={}", key, value);
-    }
-}
-
-bool ApplyEnvironmentVariable(const std::string& key, const std::string& value) {
-    if (setenv(key.c_str(), value.c_str(), 1) != 0) {
-        LOG_ERROR(Frontend, "[Freedreno] Failed to set {}={} (errno: {})", key, value, errno);
-        return false;
-    }
-    return true;
-}
-
-void ClearAllEnvironmentVariables() {
-    if (!g_config) return;
-    for (const auto& [key, value] : g_config->env_vars) {
-        unsetenv(key.c_str());
-    }
-    g_config->env_vars.clear();
-}
-
-std::string GetConfigPath() {
-    return g_base_path + "/" + kConfigFileName;
-}
-
-std::string GetPerGameConfigPath(const std::string& program_id) {
-    return g_base_path + "/" + kPerGameConfigDir + "/" + program_id + ".conf";
-}
-
-void EnsurePerGameConfigDir() {
-    std::string dir_path = g_base_path + "/" + kPerGameConfigDir;
-    mkdir(dir_path.c_str(), 0755);
-}
-
-bool LoadConfigFromFile(const std::string& config_path) {
-    if (!g_config) return false;
-
-    FILE* file = fopen(config_path.c_str(), "r");
-    if (!file) {
-        return false;
-    }
-
-    char line[512];
-    int count = 0;
-    while (fgets(line, sizeof(line), file)) {
-        size_t len = strlen(line);
-        if (len > 0 && line[len - 1] == '\n') {
-            line[len - 1] = '\0';
-            len--;
-        }
-
-        if (len == 0 || line[0] == '#') {
-            continue;
-        }
-
-        const char* eq = strchr(line, '=');
-        if (!eq) {
-            continue;
-        }
-
-        std::string key(line, eq - line);
-        std::string value(eq + 1);
-
-        g_config->env_vars[key] = value;
-        ApplyEnvironmentVariable(key, value);
-        count++;
-    }
-
-    fclose(file);
-    return count > 0;
-}
-
-bool SaveConfigToFile(const std::string& config_path) {
-    if (!g_config) return false;
-
-    FILE* file = fopen(config_path.c_str(), "w");
-    if (!file) {
-        LOG_ERROR(Frontend, "[Freedreno] Failed to open {} for writing", config_path);
-        return false;
-    }
-
-    fprintf(file, "# Freedreno/Turnip Configuration\n");
-    fprintf(file, "# Auto-generated by Eden Emulator\n\n");
-
-    for (const auto& [key, value] : g_config->env_vars) {
-        fprintf(file, "%s=%s\n", key.c_str(), value.c_str());
-    }
-
-    fclose(file);
-    return true;
-}
-
-} // anonymous namespace
-
-extern "C" {
-
-JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_setFreedrenoBasePath(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jbasePath) {
-    g_base_path = Common::Android::GetJString(env, jbasePath);
-}
-
-JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_initializeFreedrenoConfig(
-    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
-    if (!g_config) {
-        g_config = std::make_unique<FreedrenoConfig>();
-        LOG_INFO(Frontend, "[Freedreno] Configuration system initialized");
-    }
-}
-
-JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_saveFreedrenoConfig(
-    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
-    if (!g_config) {
-        LOG_WARNING(Frontend, "[Freedreno] Cannot save: not initialized");
-        return;
-    }
-
-    const std::string config_path = GetConfigPath();
-    FILE* file = fopen(config_path.c_str(), "w");
-    if (!file) {
-        LOG_ERROR(Frontend, "[Freedreno] Failed to open {} for writing", config_path);
-        return;
-    }
-
-    fprintf(file, "# Freedreno/Turnip Configuration\n");
-    fprintf(file, "# Auto-generated by Eden Emulator\n\n");
-
-    for (const auto& [key, value] : g_config->env_vars) {
-        fprintf(file, "%s=%s\n", key.c_str(), value.c_str());
-    }
-
-    fclose(file);
-    g_config->config_file_path = config_path;
-
-    LOG_INFO(Frontend, "[Freedreno] Saved {} variables to {}",
-             g_config->env_vars.size(), config_path);
-}
-
-JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_reloadFreedrenoConfig(
-    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
-    if (!g_config) {
-        LOG_WARNING(Frontend, "[Freedreno] Cannot reload: not initialized");
-        return;
-    }
-
-    const std::string config_path = GetConfigPath();
-    g_config->env_vars.clear();
-
-    FILE* file = fopen(config_path.c_str(), "r");
-    if (!file) {
-        LOG_DEBUG(Frontend, "[Freedreno] No config file found at {}", config_path);
-        return;
-    }
-
-    char line[512];
-    while (fgets(line, sizeof(line), file)) {
-        // Remove trailing newline
-        size_t len = strlen(line);
-        if (len > 0 && line[len - 1] == '\n') {
-            line[len - 1] = '\0';
-            len--;
-        }
-
-        // Skip empty lines and comments
-        if (len == 0 || line[0] == '#') {
-            continue;
-        }
-
-        // Parse key=value
-        const char* eq = strchr(line, '=');
-        if (!eq) {
-            continue;
-        }
-
-        std::string key(line, eq - line);
-        std::string value(eq + 1);
-
-        g_config->env_vars[key] = value;
-        ApplyEnvironmentVariable(key, value);
-    }
-
-    fclose(file);
-    g_config->config_file_path = config_path;
-
-    if (!g_config->env_vars.empty()) {
-        LOG_INFO(Frontend, "[Freedreno] Loaded {} variables:", g_config->env_vars.size());
-        LogActiveVariables();
-    }
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_setFreedrenoEnv(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jvarName, jstring jvalue) {
-    if (!g_config) {
-        return JNI_FALSE;
-    }
-
-    auto var_name = Common::Android::GetJString(env, jvarName);
-    auto value = Common::Android::GetJString(env, jvalue);
-
-    if (var_name.empty()) {
-        return JNI_FALSE;
-    }
-
-    g_config->env_vars[var_name] = value;
-
-    if (!ApplyEnvironmentVariable(var_name, value)) {
-        return JNI_FALSE;
-    }
-
-    LOG_INFO(Frontend, "[Freedreno] Set {}={}", var_name, value);
-    return JNI_TRUE;
-}
-
-JNIEXPORT jstring JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_getFreedrenoEnv(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jvarName) {
-    if (!g_config) {
-        return env->NewStringUTF("");
-    }
-
-    auto var_name = Common::Android::GetJString(env, jvarName);
-    auto it = g_config->env_vars.find(var_name);
-
-    if (it != g_config->env_vars.end()) {
-        return env->NewStringUTF(it->second.c_str());
-    }
-
-    return env->NewStringUTF("");
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_isFreedrenoEnvSet(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jvarName) {
-    if (!g_config) {
-        return JNI_FALSE;
-    }
-
-    auto var_name = Common::Android::GetJString(env, jvarName);
-    auto it = g_config->env_vars.find(var_name);
-
-    return (it != g_config->env_vars.end() && !it->second.empty()) ? JNI_TRUE : JNI_FALSE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_clearFreedrenoEnv(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jvarName) {
-    if (!g_config) {
-        return JNI_FALSE;
-    }
-
-    auto var_name = Common::Android::GetJString(env, jvarName);
-    auto it = g_config->env_vars.find(var_name);
-
-    if (it != g_config->env_vars.end()) {
-        g_config->env_vars.erase(it);
-        unsetenv(var_name.c_str());
-        LOG_INFO(Frontend, "[Freedreno] Cleared {}", var_name);
-        return JNI_TRUE;
-    }
-
-    return JNI_FALSE;
-}
-
-JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_clearAllFreedrenoEnv(
-    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) {
-    if (!g_config) {
-        return;
-    }
-
-    for (const auto& [key, value] : g_config->env_vars) {
-        unsetenv(key.c_str());
-    }
-
-    size_t count = g_config->env_vars.size();
-    g_config->env_vars.clear();
-
-    if (count > 0) {
-        LOG_INFO(Frontend, "[Freedreno] Cleared all {} variables", count);
-    }
-}
-
-JNIEXPORT jstring JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_getFreedrenoEnvSummary(
-    JNIEnv* env, [[maybe_unused]] jobject obj) {
-    if (!g_config || g_config->env_vars.empty()) {
-        return env->NewStringUTF("");
-    }
-
-    std::string summary;
-    for (const auto& [key, value] : g_config->env_vars) {
-        if (!summary.empty()) {
-            summary += ",";
-        }
-        summary += key + "=" + value;
-    }
-
-    return env->NewStringUTF(summary.c_str());
-}
-
-JNIEXPORT void JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_setCurrentProgramId(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jprogramId) {
-    g_current_program_id = Common::Android::GetJString(env, jprogramId);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_loadPerGameConfig(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jprogramId) {
-    if (!g_config) {
-        return JNI_FALSE;
-    }
-
-    auto program_id = Common::Android::GetJString(env, jprogramId);
-    if (program_id.empty()) {
-        return JNI_FALSE;
-    }
-
-    // Clear current environment variables first
-    ClearAllEnvironmentVariables();
-    g_current_program_id = program_id;
-
-    // Try to load per-game config - do NOT fall back to global
-    // Per-game config should start empty if no config exists yet
-    std::string per_game_path = GetPerGameConfigPath(program_id);
-    if (LoadConfigFromFile(per_game_path)) {
-        LOG_INFO(Frontend, "[Freedreno] Loaded per-game config for {}", program_id);
-        LogActiveVariables();
-        return JNI_TRUE;
-    }
-
-    // No per-game config exists - start with empty config
-    LOG_INFO(Frontend, "[Freedreno] No per-game config for {}, starting empty", program_id);
-    return JNI_FALSE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_loadPerGameConfigWithGlobalFallback(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jprogramId) {
-    if (!g_config) {
-        return JNI_FALSE;
-    }
-
-    auto program_id = Common::Android::GetJString(env, jprogramId);
-    if (program_id.empty()) {
-        return JNI_FALSE;
-    }
-
-    // Clear current environment variables first
-    ClearAllEnvironmentVariables();
-    g_current_program_id = program_id;
-
-    // Try to load per-game config first
-    std::string per_game_path = GetPerGameConfigPath(program_id);
-    if (LoadConfigFromFile(per_game_path)) {
-        LOG_INFO(Frontend, "[Freedreno] Loaded per-game config for {}", program_id);
-        LogActiveVariables();
-        return JNI_TRUE;
-    }
-
-    // Fall back to global config for emulation
-    std::string global_path = GetConfigPath();
-    if (LoadConfigFromFile(global_path)) {
-        LOG_INFO(Frontend, "[Freedreno] No per-game config for {}, using global for emulation", program_id);
-        LogActiveVariables();
-    }
-
-    return JNI_FALSE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_savePerGameConfig(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jprogramId) {
-    if (!g_config) {
-        return JNI_FALSE;
-    }
-
-    auto program_id = Common::Android::GetJString(env, jprogramId);
-    if (program_id.empty()) {
-        return JNI_FALSE;
-    }
-
-    EnsurePerGameConfigDir();
-    std::string config_path = GetPerGameConfigPath(program_id);
-
-    if (SaveConfigToFile(config_path)) {
-        LOG_INFO(Frontend, "[Freedreno] Saved per-game config for {}", program_id);
-        return JNI_TRUE;
-    }
-
-    return JNI_FALSE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_hasPerGameConfig(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jprogramId) {
-    auto program_id = Common::Android::GetJString(env, jprogramId);
-    if (program_id.empty()) {
-        return JNI_FALSE;
-    }
-
-    std::string config_path = GetPerGameConfigPath(program_id);
-    FILE* file = fopen(config_path.c_str(), "r");
-    if (file) {
-        fclose(file);
-        return JNI_TRUE;
-    }
-    return JNI_FALSE;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_org_yuzu_yuzu_1emu_utils_NativeFreedrenoConfig_deletePerGameConfig(
-    JNIEnv* env, [[maybe_unused]] jobject obj, jstring jprogramId) {
-    auto program_id = Common::Android::GetJString(env, jprogramId);
-    if (program_id.empty()) {
-        return JNI_FALSE;
-    }
-
-    std::string config_path = GetPerGameConfigPath(program_id);
-    if (remove(config_path.c_str()) == 0) {
-        LOG_INFO(Frontend, "[Freedreno] Deleted per-game config for {}", program_id);
-        return JNI_TRUE;
-    }
-    return JNI_FALSE;
-}
-
-} // extern "C"

src/android/app/src/main/res/layout/fragment_emulation.xml

@@ -171,27 +171,14 @@
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <com.google.android.material.navigation.NavigationView
-        android:id="@+id/quick_settings_sheet"
+        android:id="@+id/in_game_menu"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_gravity="end"
+        android:layout_gravity="start"
         android:focusedByDefault="true"
+        app:headerLayout="@layout/header_in_game"
+        app:menu="@menu/menu_in_game"
         android:background="?attr/colorSurface"
-        tools:visibility="gone">
-
-        <include layout="@layout/layout_quick_settings" />
-
-    </com.google.android.material.navigation.NavigationView>
-
-    <com.google.android.material.navigation.NavigationView
-    android:id="@+id/in_game_menu"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_gravity="start"
-    android:focusedByDefault="true"
-    app:headerLayout="@layout/header_in_game"
-    app:menu="@menu/menu_in_game"
-    android:background="?attr/colorSurface"
-    tools:visibility="gone" />
+        tools:visibility="gone" />
 
 </androidx.drawerlayout.widget.DrawerLayout>

src/android/app/src/main/res/layout/fragment_freedreno_settings.xml

@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinator_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_freedreno"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
-        app:elevation="0dp">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/toolbar_freedreno_layout"
-            style="?attr/collapsingToolbarLayoutMediumStyle"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-            app:contentScrim="?attr/colorSurface"
-            app:scrimVisibleHeightTrigger="100dp">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar_freedreno"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:touchscreenBlocksFocus="false"
-                app:layout_collapseMode="pin"
-                app:navigationIcon="@drawable/ic_back"
-                app:title="@string/gpu_driver_settings" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="16dp">
-
-            <!-- Presets Section -->
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp"
-                android:text="@string/freedreno_presets"
-                android:textAppearance="?attr/textAppearanceTitleMedium" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list_freedreno_presets"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:scrollbars="horizontal"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-            <!-- Current Settings Section -->
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="8dp"
-                android:text="@string/freedreno_current_settings"
-                android:textAppearance="?attr/textAppearanceTitleMedium" />
-
-            <!-- Settings List -->
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/list_freedreno_settings"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-            <!-- Debug Section -->
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="8dp"
-                android:text="@string/freedreno_debug"
-                android:textAppearance="?attr/textAppearanceTitleMedium" />
-
-            <!-- Manual Variable Input -->
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/variable_name_input_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:hint="@string/freedreno_var_name">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/variable_name_input"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="text" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/variable_value_input_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:hint="@string/freedreno_var_value">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/variable_value_input"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="text" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <Button
-                android:id="@+id/button_add_variable"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:text="@string/freedreno_add_variable" />
-
-            <!-- Action Buttons -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="16dp"
-                android:spacing="8dp">
-
-                <Button
-                    android:id="@+id/button_clear_all"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/freedreno_clear_all"
-                    style="?attr/materialButtonOutlinedStyle" />
-
-                <Button
-                    android:id="@+id/button_save"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/save" />
-
-            </LinearLayout>
-
-            <!-- Info Section -->
-            <com.google.android.material.card.MaterialCardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                app:cardElevation="0dp"
-                app:strokeWidth="1dp"
-                app:strokeColor="?attr/colorOutline">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="12dp">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/freedreno_info_title"
-                        android:textAppearance="?attr/textAppearanceTitleSmall" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/freedreno_info_description"
-                        android:textAppearance="?attr/textAppearanceBodySmall"
-                        android:textColor="?attr/colorOnSurfaceVariant" />
-
-                </LinearLayout>
-
-            </com.google.android.material.card.MaterialCardView>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/android/app/src/main/res/layout/item_quick_settings_divider.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?android:attr/listDivider" />

src/android/app/src/main/res/layout/item_quick_settings_menu.xml

@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/setting_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:paddingTop="12dp"
-        android:paddingBottom="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/setting_title"
-                style="@style/TextAppearance.Material3.TitleSmall"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/setting_value"
-                style="@style/TextAppearance.Material3.BodySmall"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textColor="?attr/colorOnSurfaceVariant" />
-
-        </LinearLayout>
-
-        <ImageView
-            android:id="@+id/expand_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:src="@drawable/ic_dropdown_arrow"
-            android:contentDescription=""
-            app:tint="?attr/colorPrimary" />
-
-    </LinearLayout>
-
-    <RadioGroup
-        android:id="@+id/radio_group"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:paddingBottom="8dp"
-        android:visibility="gone" />
-
-    <LinearLayout
-        android:id="@+id/slider_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:paddingTop="12dp"
-        android:paddingBottom="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/slider_title"
-                style="@style/TextAppearance.Material3.TitleSmall"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/slider_value_display"
-                style="@style/TextAppearance.Material3.BodySmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="?attr/colorOnSurfaceVariant" />
-
-        </LinearLayout>
-
-        <com.google.android.material.slider.Slider
-            android:id="@+id/setting_slider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:valueFrom="0"
-            android:valueTo="100"
-            android:stepSize="1" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/switch_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp"
-        android:paddingTop="12dp"
-        android:paddingBottom="8dp"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:visibility="gone">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/switch_title"
-            style="@style/TextAppearance.Material3.TitleSmall"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <com.google.android.material.materialswitch.MaterialSwitch
-            android:id="@+id/setting_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="48dp" />
-
-    </LinearLayout>
-
-</LinearLayout>

src/android/app/src/main/res/layout/item_quick_settings_status.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="16dp"
-    app:cardElevation="2dp"
-    app:cardCornerRadius="12dp"
-    app:strokeWidth="1dp"
-    app:strokeColor="?attr/colorPrimary">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:padding="16dp">
-
-        <ImageView
-            android:id="@+id/status_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:src="@drawable/ic_settings_outline"
-            android:contentDescription="" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/status_text"
-            style="@style/TextAppearance.Material3.TitleSmall"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginStart="12dp"
-            android:textColor="?attr/colorPrimary" />
-
-    </LinearLayout>
-
-</com.google.android.material.card.MaterialCardView>

src/android/app/src/main/res/layout/layout_quick_settings.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true"
-    android:fitsSystemWindows="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/quick_settings_toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="0dp"
-            app:title="@string/quick_settings"
-            app:titleTextAppearance="@style/TextAppearance.Material3.TitleLarge"
-            android:fitsSystemWindows="true" />
-
-        <LinearLayout
-            android:id="@+id/quick_settings_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingTop="8dp"
-            android:paddingBottom="16dp" />
-
-    </LinearLayout>
-
-</ScrollView>

src/android/app/src/main/res/layout/list_item_freedreno_preset.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingStart="4dp"
-    android:paddingEnd="4dp">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/preset_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minWidth="100dp"
-        android:text="Preset"
-        style="?attr/materialButtonOutlinedStyle" />
-
-</LinearLayout>

src/android/app/src/main/res/layout/list_item_freedreno_variable.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="0dp"
-    android:layout_marginEnd="0dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    app:cardElevation="0dp"
-    app:strokeWidth="1dp"
-    app:strokeColor="?attr/colorOutline">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="12dp"
-        android:gravity="center_vertical">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/variable_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="VARIABLE_NAME"
-                android:textAppearance="?attr/textAppearanceTitleSmall"
-                android:textColor="?attr/colorOnSurface" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/variable_value"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:text="variable_value"
-                android:textAppearance="?attr/textAppearanceBodySmall"
-                android:textColor="?attr/colorOnSurfaceVariant"
-                android:maxLines="1"
-                android:ellipsize="end" />
-
-        </LinearLayout>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/button_delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:text="@string/delete"
-            android:minWidth="0dp"
-            android:minHeight="36dp"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            style="?attr/materialButtonOutlinedStyle" />
-
-    </LinearLayout>
-
-</com.google.android.material.card.MaterialCardView>

src/android/app/src/main/res/menu/menu_in_game.xml

@@ -18,11 +18,6 @@
         android:icon="@drawable/ic_settings"
         android:title="@string/preferences_settings" />
 
-    <item
-        android:id="@+id/menu_quick_settings"
-        android:icon="@drawable/ic_settings"
-        android:title="@string/quick_settings" />
-
     <item
         android:id="@+id/menu_settings_per_game"
         android:icon="@drawable/ic_settings_outline"

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -148,9 +148,6 @@
         <action
             android:id="@+id/action_perGamePropertiesFragment_to_driverManagerFragment"
             app:destination="@id/driverManagerFragment" />
-        <action
-            android:id="@+id/action_perGamePropertiesFragment_to_freedrenoSettingsFragment"
-            app:destination="@id/freedrenoSettingsFragment" />
     </fragment>
     <action
         android:id="@+id/action_global_perGamePropertiesFragment"
@@ -176,15 +173,5 @@
         android:name="org.yuzu.yuzu_emu.fragments.DriverFetcherFragment"
         android:label="fragment_driver_fetcher"
         tools:layout="@layout/fragment_driver_fetcher" />
-    <fragment
-        android:id="@+id/freedrenoSettingsFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.FreedrenoSettingsFragment"
-        android:label="@string/freedreno_settings_title">
-        <argument
-            android:name="game"
-            app:argType="org.yuzu.yuzu_emu.model.Game"
-            app:nullable="true"
-            android:defaultValue="@null" />
-    </fragment>
 
 </navigation>

src/android/app/src/main/res/navigation/settings_navigation.xml

@@ -29,19 +29,4 @@
         android:name="org.yuzu.yuzu_emu.features.settings.ui.SettingsSearchFragment"
         android:label="SettingsSearchFragment" />
 
-    <fragment
-        android:id="@+id/freedrenoSettingsFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.FreedrenoSettingsFragment"
-        android:label="@string/freedreno_settings_title">
-        <argument
-            android:name="game"
-            app:argType="org.yuzu.yuzu_emu.model.Game"
-            app:nullable="true"
-            android:defaultValue="@null" />
-    </fragment>
-
-    <action
-        android:id="@+id/action_settingsFragment_to_freedrenoSettingsFragment"
-        app:destination="@id/freedrenoSettingsFragment" />
-
 </navigation>

src/android/app/src/main/res/values-ar/strings.xml

@@ -80,8 +80,6 @@
     <string name="soc_overlay_options">طبقة الجهاز</string>
     <string name="soc_overlay_options_description">ضبط المعلومات التي يتم عرضها في طبقة الجهاز</string>
 
-    <string name="show_build_id">عرض معرف البناء</string>
-    <string name="show_driver_version">عرض إصدار برنامج التشغيل</string>
     <string name="show_device_model">عرض طراز الجهاز</string>
     <string name="show_gpu_model">عرض طراز وحدة معالجة الرسومات</string>
     <string name="show_soc_model">عرض طراز الرقائق</string>
@@ -102,6 +100,11 @@
     <string name="debug_knobs_description">للإستخدام في التطوير فقط.</string>
     <string name="debug_knobs_hint">0 إلى 65535</string>
 
+    <!-- Shader Backend -->
+    <string name="shader_backend_glsl">GLSL</string>
+    <string name="shader_backend_glasm">GLASM</string>
+    <string name="shader_backend_spirv">SPIRV</string>
+
     <!-- NVDEC Emulation -->
     <string name="nvdec_emulation">محاكاة NVDEC</string>
     <string name="nvdec_emulation_description">حدد كيفية التعامل مع فك تشفير الفيديو (NVDEC) خلال المشاهد التمهيدية والمقدمة.</string>
@@ -455,6 +458,8 @@
     <!-- Graphics settings strings -->
     <string name="renderer_resolution">الدقة (الإرساء/محمول)</string>
     <string name="renderer_vsync">VSync وضع</string>
+    <string name="shader_backend">واجهة برمجة التظليل</string>
+    <string name="shader_backend_description">حدد كيفية تجميع وترجمة برامج التظليل لوحدة معالجة الرسومات الخاصة بك.</string>
     <string name="renderer_scaling_filter">مرشح ملائم للنافذة</string>
     <string name="fsr_sharpness">حدة FSR</string>
     <string name="fsr_sharpness_description">يحدد مدى وضوح الصورة عند استخدام التباين الديناميكي لـ FSR</string>
@@ -1008,6 +1013,10 @@
     <string name="ratio_force_sixteen_ten">16:10 فرض</string>
     <string name="ratio_stretch">تمديد إلى النافذة</string>
 
+    <!-- CPU Backend -->
+    <string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
+    <string name="cpu_backend_nce">تنفيذ التعليمات البرمجية الأصلية (NCE)</string>
+
     <!-- CPU Accuracy -->
     <string name="cpu_accuracy_accurate">دقيق</string>
     <string name="cpu_accuracy_unsafe">غير آمن</string>

src/android/app/src/main/res/values-ckb/strings.xml

@@ -47,8 +47,6 @@
     <string name="soc_overlay_options">ئامێر</string>
     <string name="soc_overlay_options_description">ڕێکخستنی زانیارییەکانی نیشاندراو لە ئامێرەکە</string>
 
-    <string name="show_build_id">نیشاندانی IDی بینا</string>
-    <string name="show_driver_version">نیشاندانی وەشانی درایڤەر</string>
     <string name="show_device_model">نیشاندانی مۆدێلی ئامێر</string>
     <string name="show_gpu_model">نیشاندانی مۆدێلی GPU</string>
     <string name="show_soc_model">نیشاندانی مۆدێلی SoC</string>
@@ -65,7 +63,9 @@
 
     <string name="cpuopt_unsafe_host_mmu">چالاککردنی میمیکردنی MMU میواندە</string>
     <string name="cpuopt_unsafe_host_mmu_description">ئەم باشکردنە خێرایی دەستکەوتنی بیرگە لەلایەن پرۆگرامی میوانەکە زیاد دەکات. چالاککردنی وای لێدەکات کە خوێندنەوە/نووسینەکانی بیرگەی میوانەکە ڕاستەوخۆ لە بیرگە ئەنجام بدرێت و میمیکردنی MMU میواندە بەکاربهێنێت. ناچالاککردنی ئەمە هەموو دەستکەوتنەکانی بیرگە ڕەت دەکاتەوە لە بەکارهێنانی میمیکردنی MMU نەرمەکاڵا.</string>
-
+    <!-- Shader Backend -->
+    <string name="shader_backend_glsl">GLSL</string>
+    <string name="shader_backend_glasm">GLASM</string>
     <!-- NVDEC Emulation -->
     <string name="nvdec_emulation">ئیمولەیشنی NVDEC</string>
     <string name="nvdec_emulation_description">هەڵبژاردنی ڕێگای دیکۆدکردنی ڤیدیۆ</string>
@@ -339,6 +339,8 @@
     <!-- Graphics settings strings -->
     <string name="renderer_resolution">ڕوونی (دۆخی دەستی/دۆخی دۆک)</string>
     <string name="renderer_vsync">دۆخی VSync</string>
+    <string name="shader_backend">شادەر باکند</string>
+    <string name="shader_backend_description">هەڵبژاردنی ڕێگای پێکهێنانی شادەر</string>
     <string name="renderer_scaling_filter">فلتەری گونجاندنی پەنجەرە</string>
     <string name="fsr_sharpness">تیژی FSR</string>
     <string name="fsr_sharpness_description">دیاریکردنی تیژی وێنە لە کاتی بەکارهێنانی FSR</string>

src/android/app/src/main/res/values-cs/strings.xml

@@ -47,8 +47,6 @@
     <string name="soc_overlay_options">Překryv zařízení</string>
     <string name="soc_overlay_options_description">Konfigurovat, jaké informace se zobrazí v překryvu zařízení</string>
 
-    <string name="show_build_id">Zobrazit ID sestavení</string>
-    <string name="show_driver_version">Zobrazit verzi ovladače</string>
     <string name="show_device_model">Zobrazit model zařízení</string>
     <string name="show_gpu_model">Zobrazit model GPU</string>
     <string name="show_soc_model">Zobrazit model SoC</string>
@@ -65,7 +63,9 @@
 
     <string name="cpuopt_unsafe_host_mmu">Povolit emulaci hostitelské MMU</string>
     <string name="cpuopt_unsafe_host_mmu_description">Tato optimalizace zrychluje přístup do paměti hostovaného programu. Její povolení způsobí, že čtení a zápisy do paměti hosta se provádějí přímo v paměti a využívají hostitelskou MMU. Zakázání této funkce vynutí použití softwarové emulace MMU pro všechny přístupy do paměti.</string>
-
+    <!-- Shader Backend -->
+    <string name="shader_backend_glsl">GLSL</string>
+    <string name="shader_backend_glasm">GLASM</string>
     <!-- NVDEC Emulation -->
     <string name="nvdec_emulation">Emulace NVDEC</string>
     <string name="nvdec_emulation_description">Zpracování dekódování videa</string>
@@ -327,6 +327,8 @@
     <!-- Graphics settings strings -->
     <string name="renderer_resolution">Rozlišení (Handheld/Docked)</string>
     <string name="renderer_vsync">VSync režim</string>
+    <string name="shader_backend">Backend shaderů</string>
+    <string name="shader_backend_description">Způsob kompilace shaderů</string>
     <string name="renderer_scaling_filter">Filtr přizpůsobení</string>
     <string name="fsr_sharpness">Ostrost FSR</string>
     <string name="fsr_sharpness_description">Nastavení ostrosti pro FSR</string>

src/android/app/src/main/res/values-de/strings.xml

@@ -55,8 +55,6 @@
     <string name="soc_overlay_options">Geräte-Overlay</string>
     <string name="soc_overlay_options_description">Konfigurieren Sie, welche Informationen im Geräte-Overlay angezeigt werden</string>
 
-    <string name="show_build_id">Build-ID anzeigen</string>
-    <string name="show_driver_version">Treiberversion anzeigen</string>
     <string name="show_device_model">Gerätemodell anzeigen</string>
     <string name="show_gpu_model">GPU-Modell anzeigen</string>
     <string name="show_soc_model">SoC-Modell anzeigen</string>
@@ -73,7 +71,9 @@
 
     <string name="cpuopt_unsafe_host_mmu">Host-MMU-Emulation aktivieren</string>
     <string name="cpuopt_unsafe_host_mmu_description">Diese Optimierung beschleunigt Speicherzugriffe durch das Gastprogramm. Wenn aktiviert, erfolgen Speicherlese- und -schreibvorgänge des Gastes direkt im Speicher und nutzen die MMU des Hosts. Das Deaktivieren erzwingt die Verwendung der Software-MMU-Emulation für alle Speicherzugriffe.</string>
-
+    <!-- Shader Backend -->
+    <string name="shader_backend_glsl">GLSL</string>
+    <string name="shader_backend_glasm">GLASM</string>
     <!-- NVDEC Emulation -->
     <string name="nvdec_emulation">NVDEC-Emulation</string>
     <string name="nvdec_emulation_description">Methode zur Videodekodierung</string>
@@ -383,6 +383,8 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
     <!-- Graphics settings strings -->
     <string name="renderer_resolution">Auflösung (Handheld/Gedockt)</string>
     <string name="renderer_vsync">VSync-Modus</string>
+    <string name="shader_backend">Shader-Backend</string>
+    <string name="shader_backend_description">Methode zur Shader-Kompilierung</string>
     <string name="renderer_scaling_filter">Skalierungsfilter</string>
     <string name="fsr_sharpness">FSR-Schärfe</string>
     <string name="fsr_sharpness_description">Bestimmt die Schärfe bei FSR-Nutzung.</string>
@@ -829,6 +831,10 @@ Wirklich fortfahren?</string>
     <string name="ratio_force_sixteen_ten">16:10 erzwingen</string>
     <string name="ratio_stretch">Auf Bildschirmgröße anpsassen</string>
 
+    <!-- CPU Backend -->
+    <string name="cpu_backend_dynarmic">Dynarmic (JIT)</string>
+    <string name="cpu_backend_nce">Ausführung nativen Codes (ACE)</string>
+
     <!-- CPU Accuracy -->
     <string name="cpu_accuracy_accurate">Akkurat</string>
     <string name="cpu_accuracy_unsafe">Unsicher</string>

src/android/app/src/main/res/values-es/strings.xml

@@ -65,8 +65,6 @@
     <string name="soc_overlay_options">Superposición del dispositivo</string>
     <string name="soc_overlay_options_description">Configurar qué información se muestra en la superposición del dispositivo</string>
 
-    <string name="show_build_id">Mostrar ID de compilación</string>
-    <string name="show_driver_version">Mostrar versión del controlador</string>
     <string name="show_device_model">Mostrar modelo del dispositivo</string>
     <string name="show_gpu_model">Mostrar modelo de la GPU</string>
     <string name="show_soc_model">Mostrar modelo del SoC</string>
@@ -83,7 +81,9 @@
 
     <string name="cpuopt_unsafe_host_mmu">Habilitar emulación de MMU del anfitrión</string>
     <string name="cpuopt_unsafe_host_mmu_description">Esta optimización acelera el acceso a la memoria del programa invitado. Al habilitarla, las lecturas y escrituras de la memoria del invitado se realizan directamente en la memoria y utilizan la MMU del anfitrión. Al deshabilitarla, todos los accesos a la memoria utilizan el software de emulación de la MMU.</string>
-
+    <!-- Shader Backend -->
+    <string name="shader_backend_glsl">GLSL</string>
+    <string name="shader_backend_glasm">GLASM</string>
     <!-- NVDEC Emulation -->
     <string name="nvdec_emulation">Emulación NVDEC</string>
     <string name="nvdec_emulation_description">Seleccione cómo se maneja la decodificación de vídeo (NVDEC) durante las escenas y las introducciones.</string>
@@ -398,6 +398,8 @@
     <!-- Graphics settings strings -->
     <string name="renderer_resolution">Resolución (Portátil/Sobremesa)</string>
     <string name="renderer_vsync">Modo VSync</string>
+    <string name="shader_backend">Backend de sombreador</string>
+    <string name="shader_backend_description">Elija cómo se compilan y traducen los sombreadores para su GPU.</string>
     <string name="renderer_scaling_filter">Filtro de adaptación de ventana</string>
     <string name="fsr_sharpness">Nitidez FSR</string>
     <string name="fsr_sharpness_description">Ajusta la intensidad del filtro de enfoque al usar el contraste dinámico de FSR.</string>