fix dynarmic i hope

Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3678
Reviewed-by: DraVee <chimera@dravee.dev>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>

.ci/ios/build.sh

@@ -0,0 +1,34 @@
+#!/bin/sh -ex
+
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+WORK_DIR="$PWD"
+export IOS_SDK="$(xcrun --sdk iphoneos --show-sdk-path)"
+
+[ ! -z "$IOS_SDK" ]
+
+cmake -G Xcode -B build \
+    -DCMAKE_TOOLCHAIN_FILE="$WORK_DIR/.ci/ios/ios-toolchain.cmake" \
+    -DPLATFORM=OS64 \
+    -DDEPLOYMENT_TARGET=16.0 \
+    -DCOCOA_LIBRARY="$IOS_SDK/System/Library/Frameworks/Cocoa.framework" \
+    -DCMAKE_C_COMPILER="$(xcrun --sdk iphoneos clang -arch arm64)" \
+    -DCMAKE_CXX_COMPILER="$(xcrun --sdk iphoneos clang++ -arch arm64)" \
+    -DENABLE_LIBUSB=OFF \
+    -DENABLE_UPDATE_CHECKER=OFF \
+    -DENABLE_QT=OFF \
+    -DENABLE_OPENSSL=OFF \
+    -DENABLE_WEB_SERVICE=OFF \
+    -DENABLE_CUBEB=OFF \
+    -DYUZU_ROOM=OFF \
+    -DYUZU_ROOM_STANDALONE=OFF \
+    -DYUZU_STATIC_ROOM=OFF \
+    -DYUZU_CMD=OFF \
+    -DUSE_DISCORD_PRESENCE=OFF \
+    -DYUZU_USE_EXTERNAL_FFMPEG=ON \
+    -DYUZU_USE_EXTERNAL_SDL2=ON \
+    -DCPMUTIL_FORCE_BUNDLED=ON \
+    -DCMAKE_BUILD_TYPE=Release
+
+cmake --build build

.ci/license-header.sh

@@ -115,7 +115,7 @@ for file in $FILES; do
 		*.cmake|*.sh|*CMakeLists.txt)
 			begin="#"
 			;;
-		*.kt*|*.cpp|*.h)
+		*.kt*|*.cpp|*.h|*.swift|*.mm)
 			begin="//"
 			;;
 		*)
@@ -193,7 +193,7 @@ if [ "$UPDATE" = "true" ]; then
 				begin="#"
 				shell=true
 				;;
-			*.kt*|*.cpp|*.h)
+			*.kt*|*.cpp|*.h|*.swift|*.mm)
 				begin="//"
 				shell="false"
 				;;

.gitignore

@@ -63,3 +63,4 @@ artifacts
 *.AppImage*
 /install*
 vulkansdk*.exe
+*.tar.zst

.patch/boost/0002-ios-fix.patch

@@ -0,0 +1,31 @@
+diff --git a/libs/process/src/shell.cpp b/libs/process/src/shell.cpp
+index bf4bbfd8..bc4aae89 100644
+--- a/libs/process/src/shell.cpp
++++ b/libs/process/src/shell.cpp
+@@ -19,7 +19,7 @@
+ #if defined(BOOST_PROCESS_V2_WINDOWS)
+ #include <windows.h>
+ #include <shellapi.h>
+-#elif !defined(__OpenBSD__) && !defined(__ANDROID__)
++#elif !defined(__OpenBSD__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IPHONE)
+ #include <wordexp.h>
+ #endif
+ 
+@@ -30,7 +30,7 @@ BOOST_PROCESS_V2_DECL const error_category& get_shell_category()
+ {
+     return system_category();
+ }
+-#elif !defined(__OpenBSD__) && !defined(__ANDROID__)
++#elif !defined(__OpenBSD__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IPHONE)
+ 
+ struct shell_category_t final : public error_category
+ {
+@@ -99,7 +99,7 @@ auto shell::args() const-> args_type
+     return input_.c_str();
+ }
+ 
+-#elif !defined(__OpenBSD__) && !defined(__ANDROID__)
++#elif !defined(__OpenBSD__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IPHONE)
+ 
+ void shell::parse_()
+ {

.patch/spirv-tools/0003-ios-fix.patch

@@ -0,0 +1,33 @@
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 7ab2319..333e325 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -151,9 +151,11 @@ add_custom_command(OUTPUT ${SPIRV_TOOLS_BUILD_VERSION_INC}
+    COMMENT "Update build-version.inc in the SPIRV-Tools build directory (if necessary).")
+ # Convenience target for standalone generation of the build-version.inc file.
+ # This is not required for any dependence chain.
+-add_custom_target(spirv-tools-build-version
+-   DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
+-set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "SPIRV-Tools build")
++if (NOT IOS)
++  add_custom_target(spirv-tools-build-version
++    DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
++  set_property(TARGET spirv-tools-build-version PROPERTY FOLDER "SPIRV-Tools build")
++endif()
+ 
+ list(APPEND PCH_DEPENDS
+ 	${CORE_TABLES_HEADER_INC_FILE}
+@@ -338,8 +340,11 @@ function(spirv_tools_default_target_options target)
+   )
+   set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
+   spvtools_check_symbol_exports(${target})
+-  add_dependencies(${target}
+-    spirv-tools-build-version core_tables extinst_tables)
++  if (IOS)
++    add_dependencies(${target} core_tables extinst_tables)
++  else ()
++    add_dependencies(${target} spirv-tools-build-version core_tables extinst_tables)
++  endif()
+ endfunction()
+ 
+ if (SPIRV_TOOLS_BUILD_SHARED)

CMakeLists.txt

@@ -212,7 +212,7 @@ option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.
 
 option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build metadata" OFF)
 
-cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID AND NOT IOS" OFF)
 cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
 
 cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF)
@@ -283,7 +283,7 @@ if (YUZU_ROOM)
     add_compile_definitions(YUZU_ROOM)
 endif()
 
-if ((ANDROID OR APPLE OR UNIX) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
+if ((ANDROID OR APPLE OR UNIX OR IOS) AND (NOT PLATFORM_LINUX OR ANDROID) AND NOT WIN32)
     if(CXX_APPLE OR CXX_CLANG)
         # libc++ has stop_token and jthread as experimental
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexperimental-library")
@@ -487,7 +487,12 @@ if (APPLE)
     # Umbrella framework for everything GUI-related
     find_library(COCOA_LIBRARY Cocoa REQUIRED)
     find_library(IOKIT_LIBRARY IOKit REQUIRED)
-    set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
+    if (IOS)
+        find_library(OBJC_LIBRARY objc REQUIRED)
+        set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY} ${OBJC_LIBRARY})
+    else()
+        set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
+    endif()
 elseif (WIN32)
     # Target Windows 10
     add_compile_definitions(_WIN32_WINNT=0x0A00 WINVER=0x0A00)

README.md

@@ -61,6 +61,10 @@ See the [sign-up instructions](docs/SIGNUP.md) for information on registration.
 
 Alternatively, if you wish to add translations, go to the [Eden project on Transifex](https://app.transifex.com/edenemu/eden-emulator) and review [the translations README](./dist/languages).
 
+## Documentation
+
+We have a user manual! See our [User Handbook](./docs/user/README.md).
+
 ## Building
 
 See the [General Build Guide](docs/Build.md)
@@ -69,7 +73,9 @@ For information on provided development tooling, see the [Tools directory](./too
 
 ## Download
 
-You can download the latest releases from [here](https://github.com/eden-emulator/Releases/releases).
+You can download the latest releases from [here](https://git.eden-emu.dev/eden-emu/eden/releases).
+
+Save us some bandwidth! We have [mirrors available](./docs/user/ThirdParty.md#mirrors) as well.
 
 ## Support
 

cpmfile.json

@@ -17,7 +17,8 @@
         "version": "1.57",
         "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
         "patches": [
-            "0001-clang-cl.patch"
+            "0001-clang-cl.patch",
+            "0002-ios-fix.patch"
         ]
     },
     "fmt": {

docs/Caveats.md

@@ -4,6 +4,7 @@
 - [Arch Linux](#arch-linux)
 - [Gentoo Linux](#gentoo-linux)
 - [macOS](#macos)
+- [iOS](#ios)
 - [Solaris](#solaris)
 - [HaikuOS](#haikuos)
 - [OpenBSD](#openbsd)
@@ -31,6 +32,16 @@ If you're having issues with building, always consult that ebuild.
 
 macOS is largely untested. Expect crashes, significant Vulkan issues, and other fun stuff.
 
+## iOS
+
+iOS has a dedicated build script, we **highly** recommend using that instead of doing anything else, we don't support any other configuration than the one present in said build script.
+
+To build, it's simply as easy as doing
+```sh
+chmod +x .ci/ios/build.sh
+.ci/ios/build.sh
+```
+
 ## Solaris
 
 Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.

docs/README.md

@@ -1,5 +1,7 @@
 # Eden Build Documentation
 
+Are you just a casual user? Take a look at our [User Handbook](./user) then!
+
 This contains documentation created by developers. This contains build instructions, guidelines, instructions/layouts for [cool stuff we made](./CPMUtil), and more.
 
 - **[General Build Instructions](Build.md)**
@@ -11,7 +13,6 @@ This contains documentation created by developers. This contains build instructi
 - **[CPM - CMake Package Manager](./CPMUtil)**
 - **[Platform-Specific Caveats](Caveats.md)**
 - **[The NVIDIA SM86 (Maxwell) GPU](./NvidiaGpu.md)**
-- **[User Handbook](./user)**
 - **[Dynarmic](./dynarmic)**
 - **[Cross compilation](./CrossCompile.md)**
 - **[Driver Bugs](./DriverBugs.md)**

docs/user/AddGamesToSRM.md

@@ -1,100 +0,0 @@
-# Importing Games into Steam with Steam Rom Manager
-
-Use this when you want to import your games inside Eden into Steam to launch with artwork from Steam Game Mode without needing to launch Eden first.
-
-**Click [Here](https://evilperson1337.notion.site/Importing-Games-into-Steam-with-Steam-Rom-Manager-2b757c2edaf680d7a491c92b138f1fcc) for a version of this guide with images & visual elements.**
-
----
-
-### Pre-Requisites
-
-- Steam Deck Set up and Configured
-- Eden set up and Configured
-- Internet Access
-
----
-
-## Steps
-
-1. Press the **STEAM** button and then go to *Power → Switch to Desktop* to enter the Desktop mode.
-
-1. Install ***Steam ROM Manager***, there are 2 ways you can accomplish this, either manually or through [*EmuDeck*](https://www.emudeck.com/#downloads).
-
-    ---
-
-    ### Manual Installation
-    
-    1. Open the *Discover Store* and search for *Steam ROM Manager.*        
-    2. Select the **Install** button to install the program.
-
-    ---
-    
-    ### Installing Through *EmuDeck*
-    
-    <aside>
-    
-    ***NOTE***: This assumes you have already set up EmuDeck, if not - just run through the guided installation and select *Steam ROM Manager* as one of the options.
-    
-    </aside>
-    
-    1. Open **EmuDeck**, then navigate to *Manage Emulators.*
-    2. Scroll down to the bottom of the page to the *Manage your Tools & Frontends* section. Click **Steam ROM Manager**.
-        
-    3. Click the **Install** button on the right hand side to install it.
-    
-    ---
-    
-2. Open the Start Menu and Launch ***Steam ROM Manager*** 
-
-1. The program will now launch and show you a window with parsers.
-    
-    <aside>
-    
-    ***TIP***: Your layout may look different depending on how you installed *Steam ROM Manager*.  You may need to go to **Settings → Theme** and change it to *Classic* to follow along.
-    
-    </aside>
-    
-2. Switch off all Parsers by hitting the *Toggle Parsers* switch.
-3. Scroll down the list on the left-hand side and look for a parser called *Nintendo Switch - Eden* and switch it on.  This parser may not exist depending on how you installed *Steam ROM Manager* (EmuDeck creates it for you).  Follow these steps to create it if it is missing.
-    
-    ---
-    ### Creating the Eden Parser
-    
-    1. Select Create Parser and in the *Community Presets* option look for **Nintendo Switch - Yuzu**.
-    2. Change the **Parser title** from *Nintendo Switch - Yuzu* to *Nintendo Switch - Eden.*
-    3. Hit the **Browse** option under the *ROMs directory* section.  Select the directory containing your Switch ROMs.
-    4. Under *Steam collections*, you can add a Steam category name.  This just organizes the games under a common category in your Steam Library, this is optional but recommended.
-    5. Scroll down slightly to the **Executable Configuration → Executable**, select **Browse** and select the Eden AppImage.
-    6. Leave everything else the same and hit **Save** to save the parser.
-    ---
-    
-4. Click the Eden parser to view the options on the right, select **Test** at the bottom of the screen to ensure that *Steam ROM Manager* detects your games correctly.
-1. *Steam ROM Manager* will start to scan the specified ROMs directory and match them to games.  Look over the results to ensure they are accurate.  If you do not see any entries - check your parsers ROMs directory field.
-1. When you are happy with the results, click the **Add Games** → **Parse** to start the actual Parsing.
-1. The program will now identify the games and pull artwork from [*SteamGridDB*](https://www.steamgriddb.com/).
-2. Review the game matches and ensure everything is there.
-    
-    ---
-
-    ### Correcting a Mismatch
-    
-    If the game is not identified correctly, you may need to tell *Steam ROM Manager* what the game is manually.
-    
-    1. Hover over the game card and click the magnifying glass icon.
-    2. Search for the game on the *Search SteamGridDB* section and scroll through the results, selecting the one you want.        
-    3. Ensure the *Name* and *Game ID*  update in the **Per-App Exceptions** and press **Save and close**.  The game should now update.
-
-    ---
-    
-    ### Excluding Matches
-    
-    You may want to tell Steam ROM Manager to ignore some files (updates/DLC/etc.) that it finds in the directory.  This is how you do so.
-    
-    1. Hit the **Exclude Games** button in the bottom right.
-    2. Deselect the game you want to exclude, the poster artwork should go dim and the **Number Excluded** number should increment up.  Repeat with any other exclusions you want to add.
-    3. Hit **Save Excludes** when you are happy with your selections.
-    ---
-3. When you are happy with the results, select **Save to Steam** to save the results. 
-1. The program will now start writing the entries into the Steam Library.  You should get pop up notifications of the progress, but you can monitor the progress by selecting the **Log** on the left-hand side if needed. 
-2. Restart Steam to have the changes take effect.  Check your library to ensure that your games are there, in a category if you defined one in the parser.
-3. Try to launch a game and ensure everything is working.  You are now good to go.

docs/user/CFW.md

@@ -0,0 +1,11 @@
+# User Handbook - Custom Firmware (CFW)
+
+At the moment of writing, we do not support CFW such as Atmosphere, due to:
+
+- Lacking the required LLE emulation capabilities to properly emulate the full firmware.
+- Lack of implementation on some of the key internals.
+- Nobody has bothered to do it (PRs always welcome!)
+
+We do however, maintain HLE compatibility with the former mentioned CFW, applications that require Atmosphere to run will run fine in the emulator without any adjustments.
+
+If they don't run - then that's a bug!

docs/user/Graphics.md

@@ -1,5 +1,7 @@
 # User Handbook - Graphics
 
+Graphical enhancements and visual quality improvments. This doesn't cover texture mods.
+
 ## Visual Enhancements
 
 ### Anti-aliasing
@@ -89,7 +91,7 @@ The OpenGL backend would invoke behaviour that would result in swarst/LLVMpipe w
 
 ### HaikuOS compatibility
 
-HaikuOS bundles a Mesa library that doesn't support full core OpenGL 4.6 (required by the emulator). This leads to HaikuOS being one of the few computer platforms where Vulkan is the only available option for users. If OpenGL is desired, Mesa has to be built manually from source. For debugging purpouses `lavapipe` is recommended over the GPU driver; there is in-kernel support for NVIDIA cards through.
+HaikuOS bundles a Mesa library that doesn't support full core OpenGL 4.6 (required by the emulator). This leads to HaikuOS being one of the few computer platforms where Vulkan is the only available option for users. If OpenGL is desired, Mesa has to be built manually from source. For debugging purposes `lavapipe` is recommended over the GPU driver; there is in-kernel support for NVIDIA cards through.
 
 ### Fixes for Windows 10 and above having "Device loss"
 

docs/user/Mods.md

@@ -0,0 +1,206 @@
+# User Handbook - Installing Mods
+
+## General Notes
+
+**Note:** When installing a mod, always read the mod's installation instructions.
+
+This is especially important if a mod uses a framework such as **ARCropolis**, **Skyline**, or **Atmosphere plugins**. In those cases, follow the framework's instructions instead of using Eden's normal mod folder.
+
+For example, **Super Smash Bros. Ultimate** uses such a framework. See the related section below for details.
+
+---
+
+# Installing Mods for Most Games
+
+1. Right click a game in the game list.
+2. Click **"Open Mod Data Location"**.
+3. Extract the mod into that folder.
+
+Each mod should be placed inside **its own subfolder**.
+
+---
+
+# Enabling or Disabling Mods
+
+1. Right click the game in the game list.
+2. Click **Configure Game**.
+3. In the **Add-Ons** tab, enable or disable mods, updates, and DLC by ticking or unticking their boxes.
+
+---
+
+# Important Note About SD Card Paths
+
+Some mods are designed for real Nintendo Switch consoles and refer to the **SD card root**.
+
+The emulated SD card is located at:
+
+```
+%AppData%\eden\sdmc
+```
+
+Example:
+
+```
+Switch instruction:  sd:/ultimate/mods
+Eden equivalent:     sdmc/ultimate/mods
+```
+
+---
+
+# Framework-Based Mods (Super Smash Bros. Ultimate)
+
+Some games require external mod frameworks instead of the built-in mod loader.
+
+The most common example is **Super Smash Bros. Ultimate**.
+
+These mods are installed directly to the **emulated SD card**, not the normal Eden mod folder.
+
+---
+
+# Installing the ARCropolis Modding Framework
+
+**Note:** Some mod packs bundle ARCropolis with their installer (for example, Smash Ult-S).
+
+---
+
+## 1. Download ARCropolis
+
+Download the latest release:
+
+https://github.com/Raytwo/ARCropolis/releases/
+
+---
+
+## 2. Install ARCropolis
+
+Extract the **`atmosphere`** folder into:
+
+```
+%AppData%\eden\sdmc
+```
+
+This is the **emulated SD card directory**.
+
+Verify installation by checking that the following file exists:
+
+```
+sdmc\atmosphere\contents\01006A800016E000\romfs\skyline\plugins\libarcropolis.nro
+```
+
+---
+
+## 3. Download Skyline
+
+Download the latest Skyline release:
+
+https://github.com/skyline-dev/skyline/releases
+
+Skyline used to be bundled with ARCropolis but is now distributed separately to avoid compatibility issues caused by outdated bundled versions.
+
+---
+
+## 4. Install Skyline
+
+Extract the **`exefs`** folder into:
+
+```
+sdmc\atmosphere\contents\01006A800016E000
+```
+
+The `exefs` folder should be **next to the `romfs` folder**.
+
+Verify installation by checking that the following file exists:
+
+```
+%AppData%\eden\sdmc\atmosphere\contents\01006A800016E000\exefs\subsdk9
+```
+
+---
+
+## 5. Launch the Game Once
+
+Start the game and make sure you see the **ARCropolis version text on the title screen**.
+
+This will also create the folders required for installing mods.
+
+---
+
+## 6. Install Smash Ultimate Mods
+
+Install mods inside:
+
+```
+sdmc\ultimate\mods
+```
+
+Each mod must be placed inside **its own subfolder**.
+
+Example:
+
+```
+sdmc\ultimate\mods\ExampleMod
+```
+
+---
+
+# Troubleshooting
+
+## ARCropolis text does not appear on startup
+
+Check the following:
+
+- `libarcropolis.nro` exists in:
+
+```
+sdmc\atmosphere\contents\01006A800016E000\romfs\skyline\plugins
+```
+
+- `subsdk9` exists in:
+
+```
+sdmc\atmosphere\contents\01006A800016E000\exefs
+```
+
+- Files were extracted to:
+
+```
+%AppData%\eden\sdmc
+```
+
+---
+
+## Mods are not loading
+
+Make sure mods are installed inside:
+
+```
+sdmc\ultimate\mods
+```
+
+Each mod must have its **own subfolder**.
+
+Correct example:
+
+```
+sdmc\ultimate\mods\ExampleMod
+```
+
+Incorrect example:
+
+```
+sdmc\ultimate\mods\ExampleMod\ExampleMod
+```
+
+---
+
+## Installing mods in the wrong folder
+
+ARCropolis mods **do not go in Eden's normal mod folder**.
+
+Do **not** install Smash mods here:
+
+```
+user\load\01006A800016E000
+```
+
+That folder is only used for traditional **RomFS mods**, not ARCropolis.

docs/user/README.md

@@ -4,10 +4,14 @@ The "FAQ".
 
 This handbook is primarily aimed at the end-user - baking useful knowledge for enhancing their emulation experience.
 
+A copy of this handbook is [available online](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/README.md).
+
 ## Basics
 
 - **[The Basics](Basics.md)**
 - **[Quickstart](./QuickStart.md)**
+- **[Settings](./Settings.md)**
+- **[Installing Mods](./Mods.md)**
 - **[Run On macOS](./RunOnMacOS.md)**
 - **[Audio](Audio.md)**
 - **[Graphics](Graphics.md)**
@@ -17,22 +21,29 @@ This handbook is primarily aimed at the end-user - baking useful knowledge for e
 - **[Using Amiibo](./UsingAmiibo.md)**
 - **[Using Cheats](./UsingCheats.md)**
 - **[Importing Saves](./ImportingSaves.md)**
-- **[Add Eden to Steam ROM Manager](./AddEdenToSRM.md)**
-- **[Add Games to Steam ROM Manager](./AddGamesToSRM.md)**
 - **[Installing Atmosphere Mods](./InstallingAtmosphereMods.md)**
 - **[Installing Updates & DLCs](./InstallingUpdatesDLC.md)**
 - **[Controller Profiles](./ControllerProfiles.md)**
 - **[Alter Date & Time](./AlterDateTime.md)**
 
+## 3rd-party Integration
+
+- **[Configuring Steam ROM Manager](./SteamROM.md)**
+- **[Server hosting](ServerHosting.md)**
+- **[Syncthing Guide](./SyncthingGuide.md)**
+- **[Third Party](./ThirdParty.md)**
+    - **[Obtainium](./ThirdParty.md#configuring-obtainium)**
+    - **[ES-DE](./ThirdParty.md#configuring-es-de)**
+    - **[Mirrors](./ThirdParty.md#mirrors)**
+
 ## Advanced
 
+- **[Custom Firmware](./CFW.md)**
 - **[How To Access Logs](./HowToAccessLogs.md)**
 - **[Gyro Controls](./GyroControls.md)**
 - **[Platforms and Architectures](Architectures.md)**
-- **[Server hosting](ServerHosting.md)**
 - **[Command Line](CommandLine.md)**
 - **[Native Application Development](Native.md)**
 - **[Adding Boolean Settings Toggles](AddingBooleanToggles.md)**
 - **[Adding Debug Knobs](./AddingDebugKnobs.md)**
-- **[Syncthing Guide](./SyncthingGuide.md)**
 - **[Testing](Testing.md)**

docs/user/Settings.md

@@ -0,0 +1,54 @@
+# User Handbook - Settings
+
+As the emulator continues to grow, so does the number of settings that come and go.
+
+Most of the development adds new settings that enhance performance/compatibility, only to be removed later in newer versions due to newfound discoveries or because they were "a hacky workaround".
+
+As such, this guide will NOT mention those kind of settings, we'd rather mention settings which have a long shelf time (i.e won't get removed in future releases) and are likely to be unchanged.
+
+Some of the options are self explainatory, and they do exactly what they say they do (i.e "Pause when not in focus"); such options will be also skipped due to triviality.
+
+## Foreword
+
+Before touching the settings, please see the game boots with stock options. We try our best to ensure users can boot any game using the default settings. If they don't work, then you may try fiddling with options - but please, first use stock options.
+
+## General
+
+- `General/Force X11 as Graphics Backend`: Wayland on *NIX has prominent issues that are unlikely to be resolved; the kind that are "not our fault, it's Wayland issue", this "temporary" hack forces X11 as the backend, regardless of the desktop manager's default.
+- `General/Enable Gamemode`: This only does anything when you have Feral Interactive's Gamemode library installed somewhere, if you do, this will help boost FPS by telling the OS to explicitly prioritize *this* application for "gaming" - only for *NIX systems.
+- `Hotkeys`: Deceptively to remove a hotkey you must right click and a menu will appear to remove that specific hotkey.
+- `UI/Language`: Changes language *of the interface* NOT the emulated program!
+- `Debug/Enable Auto Stub`: May help to "fix" some games by just lying and saying that everything they do returns "success" instead of outright crashing for any function/service that is NOT implemented.
+- `Debug/Show log in console`: Does as said, note that the program may need to be reopened (Windows) for changes to take effect.
+- `Debug/Flush log output`: Classically, every write to the log is "buffered", that is, changes aren't written to the disk UNTIL the program has decided it is time to write, until then it keeps data in a buffer which resides on RAM. If the program crashes, the OS will automatically discard said buffer (any RAM associated with a dead process is automatically discarded/reused for some other purpose); this means critical data may not be logged to the disk on time, which may lead to missing log lines. Use this if you're wanting to remove that factor when debugging, sometimes a hard crash may "eat" some of the log lines IF this option isn't enabled.
+- `Debug/Disable Macro HLE:` The emulator has HLE emulation of macro programs for Maxwell, this means that some details are purpousefully skipped; this option forces all macro programs to be ran without skipping anything.
+
+## System
+
+- `System/RNG Seed`: Set to 0 (and uncheck) to disable ASLR systemwide (this makes mods like CTGP to stop working); by default it enables ASLR to replicate console behaviour.
+- `Network/Enable Airplane Mode`: Enable this if a game is crashing before loading AND the logs mention anything related to "web" or "internet" services.
+
+## CPU
+
+- `CPU/Virtual table bouncing`: Some games have the tendency to crash on loading due to an indirect bad jump (Pokemon ZA being the worst offender); this option lies to the game and tells it to just pretend it never executed a given function. This is fine for most casual users, but developers of switch applications **must** disable this. This temporary "hack" should hopefully be gone in 6-7 months from now on.
+- `Fastmem`, aka. `CPU/Enable Host MMU`: Enables "fastmem"; a detailed description of fastmem can be found [here](../dynarmic/Design.md#fast-memory-fastmem).
+- `CPU/Unsafe FMA`: Enables deliberate innacurate FMA behaviour which may affect how FMA returns any given operation - this may introduce tiny floating point errors which can cascade in sensitive code (i.e FFmpeg).
+- `CPU/Faster FRSQRTE and FRECPE`: Introduces accuracy errors on square root and reciprocals in exchange for less checks - this introduces inaccuracies with some cases but it's mostly safe.
+- `CPU/Faster ASIMD Instructions`: Skips rounding mode checks for ARM ASIMD instructions - this means some code dpeending on these rounding modes may misbehave.
+- `CPU/Disable address space checks`: Before each memory access, the emulator checks the address is in range, if not it faults; this option makes it so the emulator skips the check entirely (which may be expensive for a myriad of reasons). However at the same time this allows the guest program to "break out" of the emulation context by writing to arbitrary addresses.
+- `CPU/Ignore global monitor`: This relies on a quirk present on x86 to avoid the ARM global monitor emulation, this may increase performance in mutex-heavy contexts (i.e games waiting for next frames or such); but also can cause deadlocks and fun to debug issues.
+
+It is important to note the majority of precision-reducing instructions do not benefit cases where they are not used, which means the performance gains will vary per game.
+
+# Graphics
+
+See also [an extended breakdown of some options](./Graphics.md).
+
+- `Extras/Extended Dynamic State` and `Extras/Vertex Input Dynamic State`: These Vulkan extensions essentially allow you to reuse the same pipeline but just change the state between calls (so called "dynamic state"); the "extended" levels signifies how much state can be placed on this "dynamic" range, for example the amount of depth culling to use can be placed on the dynamic state, avoiding costly reloads and flushes. While this by itself is a fine option, SOME vendors (notably PowerVR and Mali) have problems with anything related to EDS3. EDS3 contains EDS2, and EDS2 contains EDS1. Essentially this means more extended data the driver has to keep track of, at the benefit of avoiding costly flushes.
+- `Advanced/Use persistent cache`: This saves compiled shaders onto the disk, independent of any driver's own disk saved shaders (yes, some drivers, notably NVIDIA, save a secondary shader cache onto disk) - disable this only if you're debugging or working on the GPU backend. This option is meant to massively help to reduce shader stutters (after playing for one session that compiles them).
+- `Advanced/Use Vulkan pipeline cache`: This is NOT the same as `Use persistent cache`; it's a separate flag that tells the Vulkan backend to create pipeline caches, which are a detail that can be used to massively improve performance and remove pipeline creation overhead. This is a Vulkan feature.
+
+## Controls
+
+Most of the controls should work out of the box. If not, please use a joystick calibrator to ensure it's not an issue with your own controller, for example:
+- https://github.com/dkosmari/calibrate-joystick

docs/user/SteamROM.md

@@ -1,4 +1,6 @@
-# Importing Eden into Steam with Steam Rom Manager
+# User Handbook - Configuring Steam ROM Manager
+
+## Importing Eden into Steam with Steam Rom Manager
 
 Use this when you want to import the Eden AppImage into your Steam Library along with artwork using *Steam ROM Manager.*
 
@@ -6,7 +8,7 @@ Use this when you want to import the Eden AppImage into your Steam Library along
 
 ---
 
-### Pre-Requisites
+#### Pre-Requisites
 
 - Eden set up and configured
 - Internet Connection
@@ -14,9 +16,9 @@ Use this when you want to import the Eden AppImage into your Steam Library along
 
 ---
 
-## Steps
+### Steps
 
-### Initial Setup
+#### Initial Setup
 
 1. Press the **STEAM** button and then go to *Power → Switch to Desktop* to enter the Desktop mode.
 
@@ -24,14 +26,14 @@ Use this when you want to import the Eden AppImage into your Steam Library along
 
     ---
 
-    ### Manual Installation
+    #### Manual Installation
 
     1. Open the *Discover Store* and search for *Steam ROM Manager.*
     2. Select the **Install** button to install the program.
 
     ---
 
-    ### Installing Through *EmuDeck*
+    #### Installing Through *EmuDeck*
 
     <aside>
 
@@ -45,9 +47,9 @@ Use this when you want to import the Eden AppImage into your Steam Library along
 
     ---
 
-### Adding Eden into *Steam ROM Manager*
+#### Adding Eden into *Steam ROM Manager*
 
-### EmuDeck Users
+#### EmuDeck Users
 
 EmuDeck will automatically create an *Emulators - Emulators* parser for ***Steam ROM Manager*** that uses shell scripts to launch them.  We will follow this convention.
 
@@ -87,7 +89,7 @@ EmuDeck will automatically create an *Emulators - Emulators* parser for ***Steam
 
 ---
 
-### Non-EmuDeck Users
+#### Non-EmuDeck Users
 
 We will need to create a new parser for the Emulators.  Unlike with the EmuDeck model, we will have the parser look for AppImages.
 
@@ -126,7 +128,7 @@ We will need to create a new parser for the Emulators.  Unlike with the EmuDeck
 
 ---
 
-### Adding Eden to Steam
+#### Adding Eden to Steam
 
 Now that we have the parser or shell script created, we can actually add it to Steam.
 
@@ -137,7 +139,7 @@ Now that we have the parser or shell script created, we can actually add it to S
     
     ---
 
-    ### Correcting a Mismatch
+    #### Correcting a Mismatch
     
     If the emulator is not identified correctly, you may need to tell *Steam ROM Manager* what the game is manually.
     
@@ -147,7 +149,7 @@ Now that we have the parser or shell script created, we can actually add it to S
 
     ---
     
-    ### Excluding Matches
+    #### Excluding Matches
     
     You may want to tell Steam ROM Manager to ignore some files that it finds in the directory.  This is how you do so.
     
@@ -159,4 +161,105 @@ Now that we have the parser or shell script created, we can actually add it to S
 
 5. The program will now start writing the entries into the Steam Library.  You should get pop up notifications of the progress, but you can monitor the progress by selecting the **Log** on the left-hand side if needed. 
 6. Restart Steam to have the changes take effect.  Check your library to ensure that your games are there, in a category if you defined one in the parser.    
-7. Try to launch the Emulator from Steam and ensure everything is working.  You are now good to go.
+7. Try to launch the Emulator from Steam and ensure everything is working.  You are now good to go.
+
+## Importing Games into Steam with Steam Rom Manager
+
+Use this when you want to import your games inside Eden into Steam to launch with artwork from Steam Game Mode without needing to launch Eden first.
+
+**Click [Here](https://evilperson1337.notion.site/Importing-Games-into-Steam-with-Steam-Rom-Manager-2b757c2edaf680d7a491c92b138f1fcc) for a version of this guide with images & visual elements.**
+
+---
+
+#### Pre-Requisites
+
+- Steam Deck Set up and Configured
+- Eden set up and Configured
+- Internet Access
+
+---
+
+### Steps
+
+1. Press the **STEAM** button and then go to *Power → Switch to Desktop* to enter the Desktop mode.
+
+1. Install ***Steam ROM Manager***, there are 2 ways you can accomplish this, either manually or through [*EmuDeck*](https://www.emudeck.com/#downloads).
+
+    ---
+
+    #### Manual Installation
+    
+    1. Open the *Discover Store* and search for *Steam ROM Manager.*        
+    2. Select the **Install** button to install the program.
+
+    ---
+    
+    #### Installing Through *EmuDeck*
+    
+    <aside>
+    
+    ***NOTE***: This assumes you have already set up EmuDeck, if not - just run through the guided installation and select *Steam ROM Manager* as one of the options.
+    
+    </aside>
+    
+    1. Open **EmuDeck**, then navigate to *Manage Emulators.*
+    2. Scroll down to the bottom of the page to the *Manage your Tools & Frontends* section. Click **Steam ROM Manager**.
+        
+    3. Click the **Install** button on the right hand side to install it.
+    
+    ---
+    
+2. Open the Start Menu and Launch ***Steam ROM Manager*** 
+
+1. The program will now launch and show you a window with parsers.
+    
+    <aside>
+    
+    ***TIP***: Your layout may look different depending on how you installed *Steam ROM Manager*.  You may need to go to **Settings → Theme** and change it to *Classic* to follow along.
+    
+    </aside>
+    
+2. Switch off all Parsers by hitting the *Toggle Parsers* switch.
+3. Scroll down the list on the left-hand side and look for a parser called *Nintendo Switch - Eden* and switch it on.  This parser may not exist depending on how you installed *Steam ROM Manager* (EmuDeck creates it for you).  Follow these steps to create it if it is missing.
+    
+    ---
+    #### Creating the Eden Parser
+    
+    1. Select Create Parser and in the *Community Presets* option look for **Nintendo Switch - Yuzu**.
+    2. Change the **Parser title** from *Nintendo Switch - Yuzu* to *Nintendo Switch - Eden.*
+    3. Hit the **Browse** option under the *ROMs directory* section.  Select the directory containing your Switch ROMs.
+    4. Under *Steam collections*, you can add a Steam category name.  This just organizes the games under a common category in your Steam Library, this is optional but recommended.
+    5. Scroll down slightly to the **Executable Configuration → Executable**, select **Browse** and select the Eden AppImage.
+    6. Leave everything else the same and hit **Save** to save the parser.
+    ---
+    
+4. Click the Eden parser to view the options on the right, select **Test** at the bottom of the screen to ensure that *Steam ROM Manager* detects your games correctly.
+1. *Steam ROM Manager* will start to scan the specified ROMs directory and match them to games.  Look over the results to ensure they are accurate.  If you do not see any entries - check your parsers ROMs directory field.
+1. When you are happy with the results, click the **Add Games** → **Parse** to start the actual Parsing.
+1. The program will now identify the games and pull artwork from [*SteamGridDB*](https://www.steamgriddb.com/).
+2. Review the game matches and ensure everything is there.
+    
+    ---
+
+    #### Correcting a Mismatch
+    
+    If the game is not identified correctly, you may need to tell *Steam ROM Manager* what the game is manually.
+    
+    1. Hover over the game card and click the magnifying glass icon.
+    2. Search for the game on the *Search SteamGridDB* section and scroll through the results, selecting the one you want.        
+    3. Ensure the *Name* and *Game ID*  update in the **Per-App Exceptions** and press **Save and close**.  The game should now update.
+
+    ---
+    
+    #### Excluding Matches
+    
+    You may want to tell Steam ROM Manager to ignore some files (updates/DLC/etc.) that it finds in the directory.  This is how you do so.
+    
+    1. Hit the **Exclude Games** button in the bottom right.
+    2. Deselect the game you want to exclude, the poster artwork should go dim and the **Number Excluded** number should increment up.  Repeat with any other exclusions you want to add.
+    3. Hit **Save Excludes** when you are happy with your selections.
+    ---
+3. When you are happy with the results, select **Save to Steam** to save the results. 
+1. The program will now start writing the entries into the Steam Library.  You should get pop up notifications of the progress, but you can monitor the progress by selecting the **Log** on the left-hand side if needed. 
+2. Restart Steam to have the changes take effect.  Check your library to ensure that your games are there, in a category if you defined one in the parser.
+3. Try to launch a game and ensure everything is working.  You are now good to go.

docs/user/ThirdParty.md

@@ -7,3 +7,62 @@ While most of the links mentioned in this guide are relatively "safe"; we urge u
 - [Nightly Eden builds](https://github.com/pflyly/eden-nightly)
 - [NixOS Eden Flake](https://github.com/Grantimatter/eden-flake)
 - [ES-DE Frontend Support](https://github.com/GlazedBelmont/es-de-android-custom-systems)
+
+## Mirrors
+
+The main origin repository is always at https://git.eden-emu.dev/eden-emu/eden.
+
+- https://github.com/eden-emulator/mirror
+- https://git.crueter.xyz/mirror/eden
+- https://collective.taymaerz.de/eden/eden
+
+Other mirrors obviously exist on the internet, but we can't guarantee their reliability and/or availability.
+
+If you're someone wanting to make a mirror, simply setup forgejo and automatically mirror from the origin repository. Or you could mirror a mirror to save us bandwidth... your choice!
+
+## Configuring Obtainium
+
+Very nice handy app, here's a quick rundown how to configure:
+
+1. Copy the URL: https://git.eden-emu.dev/eden-emu/eden/ (or one of your favourite mirrors)
+2. Open Obtainium and tap `Add App`.
+3. Paste the URL into the `App Source URL` field.
+4. Override Source: Look for the `Override Source` dropdown menu and select `Forgejo (Codeberg)`.
+5. Click `Add:` Obtainium should now be able to parse the releases and find the APK files.
+
+Note: Even though the site isn't Codeberg, it uses the same Forgejo/Gitea backend, and this setting tells Obtainium how to read the release data.
+
+## Configuring ES-DE
+
+### Method 1
+
+1. Download ZIP from [here](https://github.com/GlazedBelmont/es-de-android-custom-systems)
+2. Unzip the file and extract `es_systems.xml` and `es_find_rules.xml` to `\Odin2\Internal shared storage\ES-DE\custom_systems`.
+3. Press `Start -> Other Settings -> Alternative Emulators` and set it to Eden (Standalone).
+
+### Method 2
+
+1. Navigate to `\Odin2\Internal shared storage\ES-DE\custom_systems`.
+2. Add this to your `es_find_rules.xml`:
+
+```xml
+<!-- Standard aka. normal release -->
+<emulator name="EDEN">
+    <rule type="androidpackage">
+        <entry>dev.eden.eden_emulator/org.yuzu.yuzu_emu.activities.EmulationActivity</entry>
+    </rule>
+</emulator>
+
+<!-- Optimized -->
+<emulator name="EDEN">
+    <rule type="androidpackage">
+        <entry>com.miHoYo.Yuanshen/org.yuzu.yuzu_emu.activities.EmulationActivity</entry>
+    </rule>
+</emulator>
+```
+
+3. Add this line of text to your `es_systems.xml` underneath where the rest of your switch system entries are:
+
+```xml
+<command label="Eden (Standalone)">%EMULATOR_EDEN% %ACTION%=android.nfc.action.TECH_DISCOVERED %DATA%=%ROMPROVIDER%</command>
+```

externals/cmake-modules/DetectArchitecture.cmake

@@ -38,13 +38,18 @@ This file is based off of Yuzu and Dynarmic.
 if (CMAKE_OSX_ARCHITECTURES)
     set(MULTIARCH_BUILD 1)
     set(ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}")
-
-    # hope and pray the architecture names match
-    foreach(ARCH IN ${CMAKE_OSX_ARCHITECTURES})
-        set(ARCHITECTURE_${ARCH} 1 PARENT_SCOPE)
-        add_definitions(-DARCHITECTURE_${ARCH}=1)
-    endforeach()
-
+    if (IOS)
+        # TODO: Right... the toolchain file won't properly accomodate OSX_ARCHITECTURE
+        # they aren't defining it as a list properly I assume?
+        set(ARCHITECTURE_arm64 1 PARENT_SCOPE)
+        add_definitions(-DARCHITECTURE_arm64=1)
+    else ()
+        # hope and pray the architecture names match
+        foreach(ARCH IN ${CMAKE_OSX_ARCHITECTURES})
+            set(ARCHITECTURE_${ARCH} 1 PARENT_SCOPE)
+            add_definitions(-DARCHITECTURE_${ARCH}=1)
+        endforeach()
+    endif()
     return()
 endif()
 

externals/cmake-modules/DetectPlatform.cmake

@@ -51,6 +51,12 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CXX_APPLE ON)
 endif()
 
+# This fixes some quirks with xcrun or weird iOS toolchain cmake files
+if (IOS)
+    unset(CXX_CLANG)
+    set(CXX_APPLE ON)
+endif()
+
 # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11112
 # This works totally fine on MinGW64, but not CLANG{,ARM}64
 if(MINGW AND CXX_CLANG)

externals/cpmfile.json

@@ -110,7 +110,8 @@
         ],
         "patches": [
             "0001-netbsd-fix.patch",
-            "0002-allow-static-only.patch"
+            "0002-allow-static-only.patch",
+            "0003-ios-fix.patch"
         ]
     },
     "spirv-headers": {

externals/ffmpeg/CMakeLists.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2021 yuzu Emulator Project
@@ -11,9 +11,9 @@ set(FFmpeg_HWACCEL_FLAGS)
 set(FFmpeg_HWACCEL_INCLUDE_DIRS)
 set(FFmpeg_HWACCEL_LDFLAGS)
 
-if (UNIX AND NOT ANDROID)
+if (UNIX AND NOT ANDROID AND NOT IOS)
     find_package(PkgConfig REQUIRED)
-    if (NOT ANDROID)
+    if (NOT ANDROID AND NOT IOS)
         pkg_check_modules(LIBVA libva)
         pkg_check_modules(CUDA cuda)
         pkg_check_modules(FFNVCODEC ffnvcodec)
@@ -182,6 +182,10 @@ else()
     find_program(BASH_PROGRAM bash REQUIRED)
 
     set(FFmpeg_CROSS_COMPILE_FLAGS "")
+    # `configure` parameters builds only exactly what yuzu needs from FFmpeg
+    # `--disable-vdpau` is needed to avoid linking issues
+    set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER}  ${CMAKE_C_COMPILER})
+    set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER}  ${CMAKE_CXX_COMPILER})
     if (ANDROID)
         string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME)
         set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
@@ -197,12 +201,22 @@ else()
             --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
             --extra-ldflags="-nostdlib"
         )
+    elseif(IOS)
+        execute_process(COMMAND xcrun --sdk iphoneos --show-sdk-path OUTPUT_VARIABLE SYSROOT)
+        # Lovely extra newline apple adds that **we** must remove... thank you apple!
+        string(STRIP "${SYSROOT}" SYSROOT)
+        set(FFmpeg_CC xcrun --sdk iphoneos clang -arch arm64)
+        set(FFmpeg_CXX xcrun --sdk iphoneos clang++ -arch arm64)
+        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
+            --arch=arm64
+            --enable-cross-compile
+            --sysroot="${SYSROOT}"
+            --extra-ldflags="-miphoneos-version-min=16.0"
+            --install-name-dir='@rpath'
+            --disable-audiotoolbox
+        )
     endif()
 
-    # `configure` parameters builds only exactly what yuzu needs from FFmpeg
-    # `--disable-vdpau` is needed to avoid linking issues
-    set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER}  ${CMAKE_C_COMPILER})
-    set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER}  ${CMAKE_CXX_COMPILER})
     add_custom_command(
         OUTPUT
             ${FFmpeg_MAKEFILE}

shell.nix

@@ -9,7 +9,7 @@ pkgs.mkShellNoCC {
     # libraries
     openssl boost fmt nlohmann_json lz4 zlib zstd
     enet libopus vulkan-headers vulkan-utility-libraries
-    spirv-tools spirv-headers vulkan-loader unzip mbedtls
+    spirv-tools spirv-headers vulkan-loader unzip
     glslang python3 httplib cpp-jwt ffmpeg-headless
     libusb1 cubeb
     # eden

src/CMakeLists.txt

@@ -255,4 +255,8 @@ if (ANDROID)
     target_include_directories(yuzu-android PRIVATE android/app/src/main)
 endif()
 
+if (IOS)
+    add_subdirectory(ios)
+endif()
+
 include(GenerateDepHashes)

src/android/app/build.gradle.kts

@@ -80,7 +80,6 @@ android {
                     listOf(
                         "-DENABLE_QT=0", // Don't use QT
                         "-DENABLE_WEB_SERVICE=1", // Enable web service
-                        "-DENABLE_OPENSSL=ON",
                         "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
                         "-DYUZU_USE_CPM=ON",
                         "-DCPMUTIL_FORCE_BUNDLED=ON",

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

@@ -152,6 +152,10 @@ object NativeLibrary {
 
     external fun surfaceDestroyed()
 
+    external fun getAppletCaptureBuffer(): ByteArray
+    external fun getAppletCaptureWidth(): Int
+    external fun getAppletCaptureHeight(): Int
+
     /**
      * Unpauses emulation from a paused state.
      */
@@ -603,6 +607,12 @@ object NativeLibrary {
      */
     external fun addFileToFilesystemProvider(path: String)
 
+    /**
+     * Adds a game-folder file to the manual filesystem provider, respecting the internal gate for
+     * game-folder external-content mounting.
+     */
+    external fun addGameFolderFileToFilesystemProvider(path: String)
+
     /**
      * Clears all files added to the manual filesystem provider in our EmulationSession instance
      */

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -204,9 +204,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
     }
 
     override fun onPause() {
-        super.onPause()
         nfcReader.stopScanning()
         stopMotionSensorListener()
+        super.onPause()
     }
 
     override fun onDestroy() {
@@ -339,6 +339,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
     }
 
     override fun onSensorChanged(event: SensorEvent) {
+        if (!NativeLibrary.isRunning() || NativeLibrary.isPaused()) {
+            return
+        }
+
         val rotation = this.display?.rotation
         if (rotation == Surface.ROTATION_90) {
             flipMotionOrientation = true

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/fetcher/SpacingItemDecoration.kt

@@ -1,10 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.features.fetcher
 
 import android.graphics.Rect
 import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 class SpacingItemDecoration(private val spacing: Int) : RecyclerView.ItemDecoration() {
@@ -15,8 +16,20 @@ class SpacingItemDecoration(private val spacing: Int) : RecyclerView.ItemDecorat
         state: RecyclerView.State
     ) {
         outRect.bottom = spacing
-        if (parent.getChildAdapterPosition(view) == 0) {
+
+        val position = parent.getChildAdapterPosition(view)
+        if (position == RecyclerView.NO_POSITION) return
+
+        if (position == 0) {
             outRect.top = spacing
+            return
+        }
+
+        // If the item is in the first row, but NOT in first column add top spacing as well
+        val layoutManager = parent.layoutManager
+        if (layoutManager is GridLayoutManager && layoutManager.spanSizeLookup.getSpanGroupIndex(position, layoutManager.spanCount) == 0) {
+            outRect.top = spacing
+            return
         }
     }
 }

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

@@ -34,6 +34,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     MAX_ANISOTROPY("max_anisotropy"),
     THEME("theme"),
     THEME_MODE("theme_mode"),
+    STATIC_THEME_COLOR("static_theme_color"),
     APP_LANGUAGE("app_language"),
     OVERLAY_SCALE("control_scale"),
     OVERLAY_OPACITY("control_opacity"),

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -68,7 +68,9 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                 MaterialAlertDialogBuilder(requireContext())
                     .setMessage(R.string.reset_setting_confirmation)
                     .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
-                        when (val item = settingsViewModel.clickedItem) {
+                        val item = settingsViewModel.clickedItem ?: return@setPositiveButton
+                        clearDialogState()
+                        when (item) {
                             is AnalogInputSetting -> {
                                 val stickParam = NativeInput.getStickParam(
                                     item.playerIndex,
@@ -107,12 +109,17 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                             }
 
                             else -> {
-                                settingsViewModel.clickedItem!!.setting.reset()
+                                item.setting.reset()
                                 settingsViewModel.setAdapterItemChanged(position)
                             }
                         }
                     }
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(android.R.string.cancel) { _: DialogInterface, _: Int ->
+                        clearDialogState()
+                    }
+                    .setOnCancelListener {
+                        clearDialogState()
+                    }
                     .create()
             }
 
@@ -186,27 +193,6 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                     updateButtonState(isValid)
                 }
 
-                /*
-                 * xbzk: these two events, along with attachRepeat feature,
-                 * were causing spinbox buttons to respond twice per press
-                 * cutting these out to retain accelerated press functionality
-                 * TODO: clean this out later if no issues arise
-                 *
-                spinboxBinding.buttonDecrement.setOnClickListener {
-                    val current = spinboxBinding.editValue.text.toString().toIntOrNull() ?: currentValue
-                    val newValue = current - 1
-                    spinboxBinding.editValue.setText(newValue.toString())
-                    updateValidity(newValue)
-                }
-
-                spinboxBinding.buttonIncrement.setOnClickListener {
-                    val current = spinboxBinding.editValue.text.toString().toIntOrNull() ?: currentValue
-                    val newValue = current + 1
-                    spinboxBinding.editValue.setText(newValue.toString())
-                    updateValidity(newValue)
-                }
-                */
-
                 fun attachRepeat(button: View, delta: Int) {
                     val handler = Handler(Looper.getMainLooper())
                     var runnable: Runnable? = null
@@ -439,9 +425,13 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
 
     private fun closeDialog() {
         settingsViewModel.setAdapterItemChanged(position)
+        clearDialogState()
+        dismiss()
+    }
+
+    private fun clearDialogState() {
         settingsViewModel.clickedItem = null
         settingsViewModel.setSliderProgress(-1f)
-        dismiss()
     }
 
     private fun getValueForSingleChoiceSelection(item: SingleChoiceSetting, which: Int): Int {

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

@@ -1066,7 +1066,10 @@ class SettingsFragmentPresenter(
                     IntSetting.THEME.getValueAsString()
 
                 override val defaultValue: Int = IntSetting.THEME.defaultValue
-                override fun reset() = IntSetting.THEME.setInt(defaultValue)
+                override fun reset() {
+                    IntSetting.THEME.setInt(defaultValue)
+                    settingsViewModel.setShouldRecreate(true)
+                }
             }
 
             add(HeaderSetting(R.string.app_settings))
@@ -1124,23 +1127,24 @@ class SettingsFragmentPresenter(
             }
 
             val staticThemeColor: AbstractIntSetting = object : AbstractIntSetting {
-                val preferences = PreferenceManager.getDefaultSharedPreferences(
-                    YuzuApplication.appContext
-                )
                 override fun getInt(needsGlobal: Boolean): Int =
-                    preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0)
+                    IntSetting.STATIC_THEME_COLOR.getInt(needsGlobal)
+
                 override fun setInt(value: Int) {
-                    preferences.edit() { putInt(Settings.PREF_STATIC_THEME_COLOR, value) }
+                    IntSetting.STATIC_THEME_COLOR.setInt(value)
                     settingsViewModel.setShouldRecreate(true)
                 }
 
-                override val key: String = Settings.PREF_STATIC_THEME_COLOR
+                override val key: String = IntSetting.STATIC_THEME_COLOR.key
                 override val isRuntimeModifiable: Boolean = true
+
                 override fun getValueAsString(needsGlobal: Boolean): String =
-                    preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0).toString()
-                override val defaultValue: Any = 0
+                    IntSetting.STATIC_THEME_COLOR.getValueAsString(needsGlobal)
+
+                override val defaultValue: Any = IntSetting.STATIC_THEME_COLOR.defaultValue
+
                 override fun reset() {
-                    preferences.edit() { putInt(Settings.PREF_STATIC_THEME_COLOR, 0) }
+                    IntSetting.STATIC_THEME_COLOR.reset()
                     settingsViewModel.setShouldRecreate(true)
                 }
             }

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

@@ -15,6 +15,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
+import android.graphics.Bitmap
 import android.net.Uri
 import android.os.BatteryManager
 import android.os.BatteryManager.*
@@ -97,6 +98,7 @@ import org.yuzu.yuzu_emu.utils.collect
 import org.yuzu.yuzu_emu.utils.CustomSettingsHandler
 import java.io.ByteArrayOutputStream
 import java.io.File
+import java.nio.ByteBuffer
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 import kotlin.or
@@ -141,6 +143,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     private var wasInputOverlayAutoHidden = false
     private var overlayTouchActive = false
+    private var pausedFrameBitmap: Bitmap? = null
 
     var shouldUseCustom = false
     private var isQuickSettingsMenuOpen = false
@@ -703,6 +706,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         binding.inGameMenu.menu.findItem(R.id.menu_quick_settings)?.isVisible =
             BooleanSetting.ENABLE_QUICK_SETTINGS.getBoolean()
 
+        binding.pausedIcon.setOnClickListener {
+            if (this::emulationState.isInitialized && emulationState.isPaused) {
+                resumeEmulationFromUi()
+            }
+        }
+
         binding.inGameMenu.menu.findItem(R.id.menu_lock_drawer).apply {
             val lockMode = IntSetting.LOCK_DRAWER.getInt()
             val titleId = if (lockMode == DrawerLayout.LOCK_MODE_LOCKED_CLOSED) {
@@ -728,11 +737,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             when (it.itemId) {
                 R.id.menu_pause_emulation -> {
                     if (emulationState.isPaused) {
-                        emulationState.run(false)
-                        updatePauseMenuEntry(false)
+                        resumeEmulationFromUi()
                     } else {
-                        emulationState.pause()
-                        updatePauseMenuEntry(true)
+                        pauseEmulationAndCaptureFrame()
                     }
                     binding.inGameMenu.requestFocus()
                     true
@@ -826,6 +833,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
 
                 R.id.menu_exit -> {
+                    clearPausedFrame()
                     emulationState.stop()
                     NativeConfig.reloadGlobalConfig()
                     emulationViewModel.setIsEmulationStopping(true)
@@ -1197,6 +1205,71 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
+    private fun pauseEmulationAndCaptureFrame() {
+        emulationState.pause()
+        updatePauseMenuEntry(true)
+        capturePausedFrameFromCore()
+        updatePausedFrameVisibility()
+    }
+
+    private fun capturePausedFrameFromCore() {
+        lifecycleScope.launch(Dispatchers.Default) {
+            val frameData = NativeLibrary.getAppletCaptureBuffer()
+            val width = NativeLibrary.getAppletCaptureWidth()
+            val height = NativeLibrary.getAppletCaptureHeight()
+            if (frameData.isEmpty() || width <= 0 || height <= 0) {
+                Log.warning(
+                    "[EmulationFragment] Paused frame capture returned empty/invalid data. " +
+                        "size=${frameData.size}, width=$width, height=$height"
+                )
+                return@launch
+            }
+
+            val expectedSize = width * height * 4
+            if (frameData.size < expectedSize) {
+                Log.warning(
+                    "[EmulationFragment] Paused frame buffer smaller than expected. " +
+                        "size=${frameData.size}, expected=$expectedSize"
+                )
+                return@launch
+            }
+
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            bitmap.copyPixelsFromBuffer(ByteBuffer.wrap(frameData, 0, expectedSize))
+
+            withContext(Dispatchers.Main) {
+                pausedFrameBitmap?.recycle()
+                pausedFrameBitmap = bitmap
+                updatePausedFrameVisibility()
+            }
+        }
+    }
+
+    private fun updatePausedFrameVisibility() {
+        val b = _binding ?: return
+        val showPausedUi = this::emulationState.isInitialized && emulationState.isPaused
+        b.pausedIcon.setVisible(showPausedUi)
+
+        val bitmap = if (showPausedUi) pausedFrameBitmap else null
+        b.pausedFrameImage.setImageBitmap(bitmap)
+        b.pausedFrameImage.setVisible(bitmap != null)
+    }
+
+    private fun resumeEmulationFromUi() {
+        clearPausedFrame()
+        emulationState.resume()
+        updatePauseMenuEntry(emulationState.isPaused)
+        updatePausedFrameVisibility()
+    }
+
+    private fun clearPausedFrame() {
+        val b = _binding
+        b?.pausedFrameImage?.setVisible(false)
+        b?.pausedFrameImage?.setImageDrawable(null)
+        pausedFrameBitmap?.recycle()
+        pausedFrameBitmap = null
+    }
+
     private fun handleLoadAmiiboSelection(): Boolean {
         val binding = _binding ?: return true
 
@@ -1290,8 +1363,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     override fun onPause() {
         if (this::emulationState.isInitialized) {
             if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
-                emulationState.pause()
-                updatePauseMenuEntry(true)
+                pauseEmulationAndCaptureFrame()
+            } else {
+                updatePausedFrameVisibility()
             }
         }
         super.onPause()
@@ -1301,6 +1375,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         super.onDestroyView()
         amiiboLoadJob?.cancel()
         amiiboLoadJob = null
+        clearPausedFrame()
         _binding?.surfaceInputOverlay?.touchEventListener = null
         _binding = null
         isAmiiboPickerOpen = false
@@ -1321,6 +1396,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             b.inGameMenu.post {
                 if (!this::emulationState.isInitialized || _binding == null) return@post
                 updatePauseMenuEntry(emulationState.isPaused)
+                updatePausedFrameVisibility()
             }
         }
 
@@ -1760,6 +1836,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             // Only update surface reference, don't trigger state changes
             emulationState.updateSurfaceReference(holder.surface)
         }
+        updatePausedFrameVisibility()
     }
 
     override fun surfaceDestroyed(holder: SurfaceHolder) {
@@ -2090,6 +2167,29 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             }
         }
 
+        @Synchronized
+        fun resume() {
+            if (state != State.PAUSED) {
+                Log.warning("[EmulationFragment] Resume called while emulation is not paused.")
+                return
+            }
+            if (!emulationCanStart.invoke()) {
+                Log.warning("[EmulationFragment] Resume blocked by emulationCanStart check.")
+                return
+            }
+            val currentSurface = surface
+            if (currentSurface == null || !currentSurface.isValid) {
+                Log.debug("[EmulationFragment] Resume requested with invalid surface.")
+                return
+            }
+
+            NativeLibrary.surfaceChanged(currentSurface)
+            Log.debug("[EmulationFragment] Resuming emulation.")
+            NativeLibrary.unpauseEmulation()
+            NativeLibrary.playTimeManagerStart()
+            state = State.RUNNING
+        }
+
         @Synchronized
         fun changeProgram(programIndex: Int) {
             emulationThread.join()
@@ -2111,7 +2211,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
         @Synchronized
         fun updateSurface() {
-            if (surface != null) {
+            if (surface != null && state == State.RUNNING) {
                 NativeLibrary.surfaceChanged(surface)
             }
         }
@@ -2127,20 +2227,20 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         @Synchronized
         fun clearSurface() {
             if (surface == null) {
-                Log.warning("[EmulationFragment] clearSurface called, but surface already null.")
+                Log.debug("[EmulationFragment] clearSurface called, but surface already null.")
             } else {
+                if (state == State.RUNNING) {
+                    pause()
+                }
+                NativeLibrary.surfaceDestroyed()
                 surface = null
                 Log.debug("[EmulationFragment] Surface destroyed.")
                 when (state) {
-                    State.RUNNING -> {
-                        state = State.PAUSED
-                    }
-
-                    State.PAUSED -> Log.warning(
+                    State.PAUSED -> Log.debug(
                         "[EmulationFragment] Surface cleared while emulation paused."
                     )
 
-                    else -> Log.warning(
+                    else -> Log.debug(
                         "[EmulationFragment] Surface cleared while emulation stopped."
                     )
                 }
@@ -2148,29 +2248,35 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
 
         private fun runWithValidSurface(programIndex: Int = 0) {
-            NativeLibrary.surfaceChanged(surface)
             if (!emulationCanStart.invoke()) {
                 return
             }
+            val currentSurface = surface
+            if (currentSurface == null || !currentSurface.isValid) {
+                Log.debug("[EmulationFragment] runWithValidSurface called with invalid surface.")
+                return
+            }
 
             when (state) {
                 State.STOPPED -> {
+                    NativeLibrary.surfaceChanged(currentSurface)
                     emulationThread = Thread({
                         Log.debug("[EmulationFragment] Starting emulation thread.")
                         NativeLibrary.run(gamePath, programIndex, true)
                     }, "NativeEmulation")
                     emulationThread.start()
+                    state = State.RUNNING
                 }
 
                 State.PAUSED -> {
-                    Log.debug("[EmulationFragment] Resuming emulation.")
-                    NativeLibrary.unpauseEmulation()
-                    NativeLibrary.playTimeManagerStart()
+                    Log.debug(
+                        "[EmulationFragment] Surface restored while emulation paused; " +
+                            "waiting for explicit resume."
+                    )
                 }
 
                 else -> Log.debug("[EmulationFragment] Bug, run called while already running.")
             }
-            state = State.RUNNING
         }
 
         private enum class State {

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

@@ -127,10 +127,6 @@ class AddonViewModel : ViewModel() {
             return
         }
 
-        // Check if there are multiple update versions
-        val updates = _patchList.value.filter { PatchType.from(it.type) == PatchType.Update }
-        val hasMultipleUpdates = updates.size > 1
-
         NativeConfig.setDisabledAddons(
             game!!.programId,
             _patchList.value.mapNotNull {
@@ -140,7 +136,7 @@ class AddonViewModel : ViewModel() {
                     if (PatchType.from(it.type) == PatchType.Update) {
                         if (it.name.contains("(NAND)") || it.name.contains("(SDMC)")) {
                             it.name
-                        } else if (hasMultipleUpdates) {
+                        } else if (it.numericVersion != 0L) {
                             "Update@${it.numericVersion}"
                         } else {
                             it.name

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.overlay
@@ -20,7 +20,6 @@ import android.os.Looper
 import android.util.AttributeSet
 import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
-import android.view.SurfaceView
 import android.view.View
 import android.view.View.OnTouchListener
 import android.view.WindowInsets
@@ -42,10 +41,10 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 
 /**
  * Draws the interactive input overlay on top of the
- * [SurfaceView] that is rendering emulation.
+ * emulation rendering surface.
  */
 class InputOverlay(context: Context, attrs: AttributeSet?) :
-    SurfaceView(context, attrs),
+    View(context, attrs),
     OnTouchListener {
     private val overlayButtons: MutableSet<InputOverlayDrawableButton> = HashSet()
     private val overlayDpads: MutableSet<InputOverlayDrawableDpad> = HashSet()

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -424,7 +424,9 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         )
 
         val uriString = result.toString()
-        val folder = gamesViewModel.folders.value.firstOrNull { it.uriString == uriString }
+        val folder = gamesViewModel.folders.value.firstOrNull {
+            it.uriString == uriString && it.type == org.yuzu.yuzu_emu.model.DirectoryType.EXTERNAL_CONTENT
+        }
         if (folder != null) {
             Toast.makeText(
                 applicationContext,

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

@@ -61,6 +61,12 @@ object DirectoryInitialization {
             saveConfig = true
         }
 
+        val staticThemeColor = preferences.migratePreference<Int>(Settings.PREF_STATIC_THEME_COLOR)
+        if (staticThemeColor != null) {
+            IntSetting.STATIC_THEME_COLOR.setInt(staticThemeColor)
+            saveConfig = true
+        }
+
         val blackBackgrounds =
             preferences.migratePreference<Boolean>(Settings.PREF_BLACK_BACKGROUNDS)
         if (blackBackgrounds != null) {

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

@@ -51,11 +51,24 @@ object GameHelper {
 
         // Scan External Content directories and register all NSP/XCI files
         val externalContentDirs = NativeConfig.getExternalContentDirs()
-        for (externalDir in externalContentDirs) {
+        val uniqueExternalContentDirs = linkedSetOf<String>()
+        externalContentDirs.forEach { externalDir ->
+            if (externalDir.isNotEmpty()) {
+                uniqueExternalContentDirs.add(externalDir)
+            }
+        }
+
+        val mountedContainerUris = mutableSetOf<String>()
+        for (externalDir in uniqueExternalContentDirs) {
             if (externalDir.isNotEmpty()) {
                 val externalDirUri = externalDir.toUri()
                 if (FileUtil.isTreeUriValid(externalDirUri)) {
-                    scanExternalContentRecursive(FileUtil.listFiles(externalDirUri), 3)
+                    scanContentContainersRecursive(FileUtil.listFiles(externalDirUri), 3) {
+                        val containerUri = it.uri.toString()
+                        if (mountedContainerUris.add(containerUri)) {
+                            NativeLibrary.addFileToFilesystemProvider(containerUri)
+                        }
+                    }
                 }
             }
         }
@@ -65,10 +78,13 @@ object GameHelper {
             val gameDirUri = gameDir.uriString.toUri()
             val isValid = FileUtil.isTreeUriValid(gameDirUri)
             if (isValid) {
+                val scanDepth = if (gameDir.deepScan) 3 else 1
+
                 addGamesRecursive(
                     games,
                     FileUtil.listFiles(gameDirUri),
-                    if (gameDir.deepScan) 3 else 1
+                    scanDepth,
+                    mountedContainerUris
                 )
             } else {
                 badDirs.add(index)
@@ -103,9 +119,10 @@ object GameHelper {
     // be done better imo.
     private val externalContentExtensions = setOf("nsp", "xci")
 
-    private fun scanExternalContentRecursive(
+    private fun scanContentContainersRecursive(
         files: Array<MinimalDocumentFile>,
-        depth: Int
+        depth: Int,
+        onContainerFound: (MinimalDocumentFile) -> Unit
     ) {
         if (depth <= 0) {
             return
@@ -113,14 +130,15 @@ object GameHelper {
 
         files.forEach {
             if (it.isDirectory) {
-                scanExternalContentRecursive(
+                scanContentContainersRecursive(
                     FileUtil.listFiles(it.uri),
-                    depth - 1
+                    depth - 1,
+                    onContainerFound
                 )
             } else {
                 val extension = FileUtil.getExtension(it.uri).lowercase()
                 if (externalContentExtensions.contains(extension)) {
-                    NativeLibrary.addFileToFilesystemProvider(it.uri.toString())
+                    onContainerFound(it)
                 }
             }
         }
@@ -129,7 +147,8 @@ object GameHelper {
     private fun addGamesRecursive(
         games: MutableList<Game>,
         files: Array<MinimalDocumentFile>,
-        depth: Int
+        depth: Int,
+        mountedContainerUris: MutableSet<String>
     ) {
         if (depth <= 0) {
             return
@@ -140,11 +159,20 @@ object GameHelper {
                 addGamesRecursive(
                     games,
                     FileUtil.listFiles(it.uri),
-                    depth - 1
+                    depth - 1,
+                    mountedContainerUris
                 )
             } else {
-                if (Game.extensions.contains(FileUtil.getExtension(it.uri))) {
-                    val game = getGame(it.uri, true)
+                val extension = FileUtil.getExtension(it.uri).lowercase()
+                val filePath = it.uri.toString()
+
+                if (externalContentExtensions.contains(extension) &&
+                    mountedContainerUris.add(filePath)) {
+                    NativeLibrary.addGameFolderFileToFilesystemProvider(filePath)
+                }
+
+                if (Game.extensions.contains(extension)) {
+                    val game = getGame(it.uri, true, false)
                     if (game != null) {
                         games.add(game)
                     }
@@ -153,14 +181,20 @@ object GameHelper {
         }
     }
 
-    fun getGame(uri: Uri, addedToLibrary: Boolean): Game? {
+    fun getGame(
+        uri: Uri,
+        addedToLibrary: Boolean,
+        registerFilesystemProvider: Boolean = true
+    ): Game? {
         val filePath = uri.toString()
         if (!GameMetadata.getIsValid(filePath)) {
             return null
         }
 
-        // Needed to update installed content information
-        NativeLibrary.addFileToFilesystemProvider(filePath)
+        if (registerFilesystemProvider) {
+            // Needed to update installed content information
+            NativeLibrary.addFileToFilesystemProvider(filePath)
+        }
 
         var name = GameMetadata.getTitle(filePath)
 

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.utils
@@ -80,16 +80,14 @@ object PathUtil {
         }
     }
 
-    // This really shouldn't be necessary, but the Android API seemingly
-    // doesn't have a way of doing this?
-    // Apparently, on certain devices the mount location can vary, so add
-    // extra cases here if we discover any new ones.
     fun getRemovableStoragePath(idString: String): String? {
-        var pathFile: File
+        val possibleMountPaths = listOf("/mnt/media_rw/$idString", "/storage/$idString")
 
-        pathFile = File("/mnt/media_rw/$idString");
-        if (pathFile.exists()) {
-            return pathFile.absolutePath
+        for (mountPath in possibleMountPaths) {
+            val pathFile = File(mountPath);
+            if (pathFile.exists()) {
+                return pathFile.absolutePath
+            }
         }
 
         return null

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.utils
@@ -52,7 +52,7 @@ object ThemeHelper {
     }
 
     private fun getSelectedStaticThemeColor(): Int {
-        val themeIndex = preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0)
+        val themeIndex = IntSetting.STATIC_THEME_COLOR.getInt(false)
         val themes = arrayOf(
             R.style.Theme_Eden_Main,
             R.style.Theme_Yuzu_Main_Violet,

src/android/app/src/main/java/org/yuzu/yuzu_emu/views/GradientBorderCardView.kt

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -11,8 +11,7 @@ import android.graphics.*
 import android.util.AttributeSet
 import com.google.android.material.card.MaterialCardView
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.features.settings.model.Settings
-import androidx.preference.PreferenceManager
+import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 
 class GradientBorderCardView @JvmOverloads constructor(
     context: Context,
@@ -44,12 +43,7 @@ class GradientBorderCardView @JvmOverloads constructor(
     }
 
     private fun updateThemeState() {
-        val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-        val themeIndex = try {
-            prefs.getInt(Settings.PREF_STATIC_THEME_COLOR, 0)
-        } catch (e: Exception) {
-            0 // Default to Eden theme if error
-        }
+        val themeIndex = IntSetting.STATIC_THEME_COLOR.getInt(false)
         isEdenTheme = themeIndex == 0
         invalidate()
     }

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

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -27,10 +27,7 @@ if (ARCHITECTURE_arm64)
     target_link_libraries(yuzu-android PRIVATE adrenotools)
 endif()
 
-if (ENABLE_OPENSSL OR ENABLE_WEB_SERVICE)
-    target_link_libraries(yuzu-android PRIVATE OpenSSL::SSL cpp-jwt::cpp-jwt)
-endif()
-
+target_link_libraries(yuzu-android PRIVATE OpenSSL::SSL cpp-jwt::cpp-jwt)
 if (ENABLE_UPDATE_CHECKER)
     target_compile_definitions(yuzu-android PUBLIC ENABLE_UPDATE_CHECKER)
 endif()

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

@@ -33,6 +33,12 @@ void AndroidConfig::ReadAndroidValues() {
     if (global) {
         ReadAndroidUIValues();
         ReadUIValues();
+        BeginGroup(Settings::TranslateCategory(Settings::Category::DataStorage));
+        Settings::values.ext_content_from_game_dirs = ReadBooleanSetting(
+            std::string("ext_content_from_game_dirs"),
+            std::make_optional(
+                Settings::values.ext_content_from_game_dirs.GetDefault()));
+        EndGroup();
         ReadOverlayValues();
     }
     ReadDriverValues();

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

@@ -56,6 +56,7 @@ namespace AndroidSettings {
 
         Settings::Setting<s32> theme{linkage, 0, "theme", Settings::Category::Android};
         Settings::Setting<s32> theme_mode{linkage, -1, "theme_mode", Settings::Category::Android};
+        Settings::Setting<s32> static_theme_color{linkage, 5, "static_theme_color", Settings::Category::Android};
         Settings::Setting<bool> black_backgrounds{linkage, false, "black_backgrounds",
                                                   Settings::Category::Android};
         Settings::Setting<s32> app_language{linkage, 0, "app_language", Settings::Category::Android};

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

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -14,6 +17,14 @@
 #include "jni/native.h"
 
 void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
+    if (!surface) {
+        LOG_INFO(Frontend, "EmuWindow_Android::OnSurfaceChanged received null surface");
+        m_window_width = 0;
+        m_window_height = 0;
+        window_info.render_surface = nullptr;
+        return;
+    }
+
     m_window_width = ANativeWindow_getWidth(surface);
     m_window_height = ANativeWindow_getHeight(surface);
 

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

@@ -96,6 +96,11 @@ jboolean Java_org_yuzu_yuzu_1emu_utils_GameMetadata_getIsValid(JNIEnv* env, jobj
         return false;
     }
 
+    if ((file_type == Loader::FileType::NSP || file_type == Loader::FileType::XCI) &&
+        !Loader::IsBootableGameContainer(file, file_type)) {
+        return false;
+    }
+
     u64 program_id = 0;
     Loader::ResultStatus res = loader->ReadProgramId(program_id);
     if (res != Loader::ResultStatus::Success) {

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

@@ -89,6 +89,8 @@
 #include "jni/native.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_vulkan/renderer_vulkan.h"
+#include "video_core/capture.h"
+#include "video_core/textures/decoders.h"
 #include "video_core/vulkan_common/vulkan_instance.h"
 #include "video_core/vulkan_common/vulkan_surface.h"
 #include "video_core/shader_notify.h"
@@ -215,107 +217,8 @@ void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath)
         return;
     }
 
-    const auto extension = Common::ToLower(filepath.substr(filepath.find_last_of('.') + 1));
-
-    if (extension == "nsp") {
-        auto nsp = std::make_shared<FileSys::NSP>(file);
-        if (nsp->GetStatus() == Loader::ResultStatus::Success) {
-            std::map<u64, u32> nsp_versions;
-            std::map<u64, std::string> nsp_version_strings;
-
-            for (const auto& [title_id, nca_map] : nsp->GetNCAs()) {
-                for (const auto& [type_pair, nca] : nca_map) {
-                    const auto& [title_type, content_type] = type_pair;
-
-                    if (content_type == FileSys::ContentRecordType::Meta) {
-                        const auto meta_nca = std::make_shared<FileSys::NCA>(nca->GetBaseFile());
-                        if (meta_nca->GetStatus() == Loader::ResultStatus::Success) {
-                            const auto section0 = meta_nca->GetSubdirectories();
-                            if (!section0.empty()) {
-                                for (const auto& meta_file : section0[0]->GetFiles()) {
-                                    if (meta_file->GetExtension() == "cnmt") {
-                                        FileSys::CNMT cnmt(meta_file);
-                                        nsp_versions[cnmt.GetTitleID()] = cnmt.GetTitleVersion();
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if (content_type == FileSys::ContentRecordType::Control &&
-                        title_type == FileSys::TitleType::Update) {
-                        auto romfs = nca->GetRomFS();
-                        if (romfs) {
-                            auto extracted = FileSys::ExtractRomFS(romfs);
-                            if (extracted) {
-                                auto nacp_file = extracted->GetFile("control.nacp");
-                                if (!nacp_file) {
-                                    nacp_file = extracted->GetFile("Control.nacp");
-                                }
-                                if (nacp_file) {
-                                    FileSys::NACP nacp(nacp_file);
-                                    auto ver_str = nacp.GetVersionString();
-                                    if (!ver_str.empty()) {
-                                        nsp_version_strings[title_id] = ver_str;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (const auto& [title_id, nca_map] : nsp->GetNCAs()) {
-                for (const auto& [type_pair, nca] : nca_map) {
-                    const auto& [title_type, content_type] = type_pair;
-
-                    if (title_type == FileSys::TitleType::Update) {
-                        u32 version = 0;
-                        auto ver_it = nsp_versions.find(title_id);
-                        if (ver_it != nsp_versions.end()) {
-                            version = ver_it->second;
-                        }
-
-                        std::string version_string;
-                        auto str_it = nsp_version_strings.find(title_id);
-                        if (str_it != nsp_version_strings.end()) {
-                            version_string = str_it->second;
-                        }
-
-                        m_manual_provider->AddEntryWithVersion(
-                            title_type, content_type, title_id, version, version_string,
-                            nca->GetBaseFile());
-
-                        LOG_DEBUG(Frontend, "Added NSP update entry - TitleID: {:016X}, Version: {}, VersionStr: {}",
-                                  title_id, version, version_string);
-                    } else {
-                        // Use regular AddEntry for non-updates
-                        m_manual_provider->AddEntry(title_type, content_type, title_id,
-                                                    nca->GetBaseFile());
-                        LOG_DEBUG(Frontend, "Added NSP entry - TitleID: {:016X}, TitleType: {}, ContentType: {}",
-                                  title_id, static_cast<int>(title_type), static_cast<int>(content_type));
-                    }
-                }
-            }
-            return;
-        }
-    }
-
-    // Handle XCI files
-    if (extension == "xci") {
-        FileSys::XCI xci{file};
-        if (xci.GetStatus() == Loader::ResultStatus::Success) {
-            const auto nsp = xci.GetSecurePartitionNSP();
-            if (nsp) {
-                for (const auto& title : nsp->GetNCAs()) {
-                    for (const auto& entry : title.second) {
-                        m_manual_provider->AddEntry(entry.first.first, entry.first.second, title.first,
-                                                    entry.second->GetBaseFile());
-                    }
-                }
-            }
-            return;
-        }
+    if (m_manual_provider->AddEntriesFromContainer(file)) {
+        return;
     }
 
     auto loader = Loader::GetLoader(m_system, file);
@@ -337,6 +240,13 @@ void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath)
     }
 }
 
+void EmulationSession::ConfigureFilesystemProviderFromGameFolder(const std::string& filepath) {
+    if (!Settings::values.ext_content_from_game_dirs.GetValue()) {
+        return;
+    }
+    ConfigureFilesystemProvider(filepath);
+}
+
 void EmulationSession::InitializeSystem(bool reload) {
     if (!reload) {
         // Initialize logging system
@@ -780,9 +690,10 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject i
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jobject instance) {
-    ANativeWindow_release(EmulationSession::GetInstance().NativeWindow());
+    if (auto* native_window = EmulationSession::GetInstance().NativeWindow(); native_window) {
+        ANativeWindow_release(native_window);
+    }
     EmulationSession::GetInstance().SetNativeWindow(nullptr);
-    EmulationSession::GetInstance().SurfaceChanged();
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject instance,
@@ -969,6 +880,40 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass claz
     return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());
 }
 
+jbyteArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAppletCaptureBuffer(JNIEnv* env, jclass clazz) {
+    using namespace VideoCore::Capture;
+
+    if (!EmulationSession::GetInstance().IsRunning()) {
+        return env->NewByteArray(0);
+    }
+
+    const auto tiled = EmulationSession::GetInstance().System().GPU().GetAppletCaptureBuffer();
+    if (tiled.size() < TiledSize) {
+        return env->NewByteArray(0);
+    }
+
+    std::vector<u8> linear(LinearWidth * LinearHeight * BytesPerPixel);
+    Tegra::Texture::UnswizzleTexture(linear, tiled, BytesPerPixel, LinearWidth, LinearHeight,
+                                     LinearDepth, BlockHeight, BlockDepth);
+
+    auto buffer = env->NewByteArray(static_cast<jsize>(linear.size()));
+    if (!buffer) {
+        return env->NewByteArray(0);
+    }
+
+    env->SetByteArrayRegion(buffer, 0, static_cast<jsize>(linear.size()),
+                            reinterpret_cast<const jbyte*>(linear.data()));
+    return buffer;
+}
+
+jint Java_org_yuzu_yuzu_1emu_NativeLibrary_getAppletCaptureWidth(JNIEnv* env, jclass clazz) {
+    return static_cast<jint>(VideoCore::Capture::LinearWidth);
+}
+
+jint Java_org_yuzu_yuzu_1emu_NativeLibrary_getAppletCaptureHeight(JNIEnv* env, jclass clazz) {
+    return static_cast<jint>(VideoCore::Capture::LinearHeight);
+}
+
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeSystem(JNIEnv* env, jclass clazz,
                                                             jboolean reload) {
     // Initialize the emulated system.
@@ -1572,6 +1517,12 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_addFileToFilesystemProvider(JNIEnv* e
         Common::Android::GetJString(env, jpath));
 }
 
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_addGameFolderFileToFilesystemProvider(
+    JNIEnv* env, jobject jobj, jstring jpath) {
+    EmulationSession::GetInstance().ConfigureFilesystemProviderFromGameFolder(
+        Common::Android::GetJString(env, jpath));
+}
+
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_clearFilesystemProvider(JNIEnv* env, jobject jobj) {
     EmulationSession::GetInstance().GetContentProvider()->ClearAllEntries();
 }

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

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -46,6 +49,7 @@ public:
     const Core::PerfStatsResults& PerfStats();
     int ShadersBuilding();
     void ConfigureFilesystemProvider(const std::string& filepath);
+    void ConfigureFilesystemProviderFromGameFolder(const std::string& filepath);
     void InitializeSystem(bool reload);
     void SetAppletId(int applet_id);
     Core::SystemResultStatus InitializeEmulation(const std::string& filepath,

src/android/app/src/main/res/drawable/circle_white.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="#E6FFFFFF" />
+</shape>

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

@@ -108,6 +108,22 @@
 
         </FrameLayout>
 
+        <FrameLayout
+            android:id="@+id/paused_frame_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="false">
+
+            <ImageView
+                android:id="@+id/paused_frame_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@null"
+                android:scaleType="fitCenter"
+                android:visibility="gone" />
+
+        </FrameLayout>
+
         <FrameLayout
             android:id="@+id/input_container"
             android:layout_width="match_parent"
@@ -142,6 +158,18 @@
             android:layout_height="match_parent"
             android:fitsSystemWindows="false">
 
+            <ImageView
+                android:id="@+id/paused_icon"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_gravity="center"
+                android:background="@drawable/circle_white"
+                android:contentDescription="@string/emulation_unpause"
+                android:padding="14dp"
+                android:src="@drawable/ic_play"
+                android:visibility="gone"
+                app:tint="@android:color/black" />
+
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/show_stats_overlay_text"
                 style="@style/TextAppearance.Material3.BodySmall"

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

@@ -1222,12 +1222,12 @@
 
     <!-- Static Themes -->
     <string name="static_theme_color">Theme Color</string>
-    <string name="eden_theme">Eden (Default)</string>
+    <string name="eden_theme">Eden</string>
     <string name="violet">Violet</string>
     <string name="blue">Blue</string>
     <string name="cyan">Cyan</string>
     <string name="red">Red</string>
-    <string name="green">Green</string>
+    <string name="green">Green (Default)</string>
     <string name="yellow">Yellow</string>
     <string name="orange">Orange</string>
     <string name="pink">Pink</string>

src/common/device_power_state.cpp

@@ -14,11 +14,14 @@ extern std::atomic<bool> g_has_battery;
 
 #elif defined(__APPLE__)
 #include <TargetConditionals.h>
-#if TARGET_OS_MAC
+#if defined(TARGET_OS_MAC) && TARGET_OS_MAC
+#if TARGET_OS_IPHONE
+// ios doesnt have this
+#else
 #include <IOKit/ps/IOPSKeys.h>
 #include <IOKit/ps/IOPowerSources.h>
 #endif
-
+#endif
 #elif defined(__linux__)
 #include <fstream>
 #include <string>
@@ -48,7 +51,9 @@ namespace Common {
         info.percentage = g_battery_percentage.load(std::memory_order_relaxed);
         info.charging = g_is_charging.load(std::memory_order_relaxed);
         info.has_battery = g_has_battery.load(std::memory_order_relaxed);
-
+#elif defined(__APPLE__) && TARGET_OS_IPHONE
+        // Not implemented
+        info.has_battery = false;
 #elif defined(__APPLE__) && TARGET_OS_MAC
         CFTypeRef info_ref = IOPSCopyPowerSourcesInfo();
         CFArrayRef sources = IOPSCopyPowerSourcesList(info_ref);
@@ -96,7 +101,6 @@ namespace Common {
 #else
         info.has_battery = false;
 #endif
-
         return info;
     }
 }

src/common/host_memory.cpp

@@ -27,7 +27,11 @@
 #include <sys/random.h>
 #elif defined(__APPLE__)
 #include <sys/types.h>
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+// Not available on iOS for some fucking stupid reason...
+#else
 #include <sys/random.h>
+#endif
 #include <mach/vm_map.h>
 #include <mach/mach.h>
 #endif

src/common/settings.h

@@ -756,6 +756,8 @@ struct Values {
                                         Category::DataStorage};
     Setting<std::string> gamecard_path{linkage, std::string(), "gamecard_path",
                                        Category::DataStorage};
+    Setting<bool> ext_content_from_game_dirs{linkage, true, "ext_content_from_game_dirs",
+                                             Category::DataStorage};
     std::vector<std::string> external_content_dirs;
 
     // Debugging

src/core/crypto/aes_util.cpp

@@ -38,7 +38,6 @@ struct CipherContext {
 static inline const std::string GetCipherName(Mode mode, u32 key_size) {
     std::string cipher;
     std::size_t effective_bits = key_size * 8;
-
     switch (mode) {
     case Mode::CTR:
         cipher = "CTR";
@@ -53,7 +52,6 @@ static inline const std::string GetCipherName(Mode mode, u32 key_size) {
     default:
         UNREACHABLE();
     }
-
     return fmt::format("AES-{}-{}", effective_bits, cipher);
 };
 
@@ -87,8 +85,7 @@ static EVP_CIPHER *GetCipher(Mode mode, u32 key_size) {
 
 // TODO: WHY TEMPLATE???????
 template <typename Key, std::size_t KeySize>
-Crypto::AESCipher<Key, KeySize>::AESCipher(Key key, Mode mode)
-    : ctx(std::make_unique<CipherContext>()) {
+Crypto::AESCipher<Key, KeySize>::AESCipher(Key key, Mode mode) : ctx(std::make_unique<CipherContext>()) {
 
     ctx->encryption_context = EVP_CIPHER_CTX_new();
     ctx->decryption_context = EVP_CIPHER_CTX_new();
@@ -99,9 +96,7 @@ Crypto::AESCipher<Key, KeySize>::AESCipher(Key key, Mode mode)
         UNIMPLEMENTED();
     }
 
-    ASSERT_MSG(ctx->encryption_context && ctx->decryption_context && ctx->cipher,
-               "OpenSSL cipher context failed init!");
-
+    ASSERT(ctx->encryption_context && ctx->decryption_context && ctx->cipher && "OpenSSL cipher context failed init!");
     // now init ciphers
     ASSERT(EVP_CipherInit_ex2(ctx->encryption_context, ctx->cipher, key.data(), NULL, 1, NULL));
     ASSERT(EVP_CipherInit_ex2(ctx->decryption_context, ctx->cipher, key.data(), NULL, 0, NULL));
@@ -165,8 +160,7 @@ void AESCipher<Key, KeySize>::Transcode(const u8* src, std::size_t size, u8* des
 template <typename Key, std::size_t KeySize>
 void AESCipher<Key, KeySize>::XTSTranscode(const u8* src, std::size_t size, u8* dest,
                                            std::size_t sector_id, std::size_t sector_size, Op op) {
-    ASSERT_MSG(size % sector_size == 0, "XTS decryption size must be a multiple of sector size.");
-
+    ASSERT(size % sector_size == 0 && "XTS decryption size must be a multiple of sector size.");
     for (std::size_t i = 0; i < size; i += sector_size) {
         SetIV(CalculateNintendoTweak(sector_id++));
         Transcode(src + i, sector_size, dest + i, op);
@@ -177,8 +171,7 @@ template <typename Key, std::size_t KeySize>
 void AESCipher<Key, KeySize>::SetIV(std::span<const u8> data) {
     const int ret_enc = EVP_CipherInit_ex(ctx->encryption_context, nullptr, nullptr, nullptr, data.data(), -1);
     const int ret_dec = EVP_CipherInit_ex(ctx->decryption_context, nullptr, nullptr, nullptr, data.data(), -1);
-
-    ASSERT_MSG(ret_enc == 1 && ret_dec == 1, "Failed to set IV on OpenSSL contexts");
+    ASSERT(ret_enc == 1 && ret_dec == 1 && "Failed to set IV on OpenSSL contexts");
 }
 
 template class AESCipher<Key128>;

src/core/crypto/sha_util.cpp

@@ -1,4 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-namespace Crypto {} // namespace Crypto

src/core/crypto/sha_util.h

@@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/assert.h"
-#include "core/file_sys/vfs.h"
-#include "key_manager.h"
-#include "mbedtls/cipher.h"
-
-namespace Crypto {
-typedef std::array<u8, 0x20> SHA256Hash;
-
-inline SHA256Hash operator"" _HASH(const char* data, size_t len) {
-    if (len != 0x40)
-        return {};
-}
-
-} // namespace Crypto

src/core/file_sys/patch_manager.cpp

@@ -117,6 +117,12 @@ void AppendCommaIfNotEmpty(std::string& to, std::string_view with) {
 bool IsDirValidAndNonEmpty(const VirtualDir& dir) {
     return dir != nullptr && (!dir->GetFiles().empty() || !dir->GetSubdirectories().empty());
 }
+
+bool IsVersionedExternalUpdateDisabled(const std::vector<std::string>& disabled, u32 version) {
+    const std::string disabled_key = fmt::format("Update@{}", version);
+    return std::find(disabled.cbegin(), disabled.cend(), disabled_key) != disabled.cend() ||
+           std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
+}
 } // Anonymous namespace
 
 PatchManager::PatchManager(u64 title_id_,
@@ -155,8 +161,7 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
             if (!update_versions.empty()) {
                 checked_external = true;
                 for (const auto& update_entry : update_versions) {
-                    std::string disabled_key = fmt::format("Update@{}", update_entry.version);
-                    if (std::find(disabled.cbegin(), disabled.cend(), disabled_key) == disabled.cend()) {
+                    if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
                         update_disabled = false;
                         enabled_version = update_entry.version;
                         break;
@@ -175,8 +180,7 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
                 if (!manual_update_versions.empty()) {
                     checked_manual = true;
                     for (const auto& update_entry : manual_update_versions) {
-                        std::string disabled_key = fmt::format("Update@{}", update_entry.version);
-                        if (std::find(disabled.cbegin(), disabled.cend(), disabled_key) == disabled.cend()) {
+                        if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
                             update_disabled = false;
                             enabled_version = update_entry.version;
                             break;
@@ -580,8 +584,7 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs
             if (!update_versions.empty()) {
                 checked_external = true;
                 for (const auto& update_entry : update_versions) {
-                    std::string disabled_key = fmt::format("Update@{}", update_entry.version);
-                    if (std::find(disabled.cbegin(), disabled.cend(), disabled_key) == disabled.cend()) {
+                    if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
                         update_disabled = false;
                         enabled_version = update_entry.version;
                         update_raw = external_provider->GetEntryForVersion(update_tid, type, update_entry.version);
@@ -600,8 +603,7 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs
                 if (!manual_update_versions.empty()) {
                     checked_manual = true;
                     for (const auto& update_entry : manual_update_versions) {
-                        std::string disabled_key = fmt::format("Update@{}", update_entry.version);
-                        if (std::find(disabled.cbegin(), disabled.cend(), disabled_key) == disabled.cend()) {
+                        if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
                             update_disabled = false;
                             enabled_version = update_entry.version;
                             update_raw = manual_provider->GetEntryForVersion(update_tid, type, update_entry.version);
@@ -704,9 +706,8 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
                     version_str = FormatTitleVersion(update_entry.version);
                 }
 
-                std::string disabled_key = fmt::format("Update@{}", update_entry.version);
                 const auto update_disabled =
-                    std::find(disabled.cbegin(), disabled.cend(), disabled_key) != disabled.cend();
+                    IsVersionedExternalUpdateDisabled(disabled, update_entry.version);
 
                 Patch update_patch = {.enabled = !update_disabled,
                                       .name = "Update",
@@ -732,9 +733,8 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
                     version_str = FormatTitleVersion(update_entry.version);
                 }
 
-                std::string disabled_key = fmt::format("Update@{}", update_entry.version);
                 const auto update_disabled =
-                    std::find(disabled.cbegin(), disabled.cend(), disabled_key) != disabled.cend();
+                    IsVersionedExternalUpdateDisabled(disabled, update_entry.version);
 
 
                 Patch update_patch = {.enabled = !update_disabled,
@@ -771,7 +771,8 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
             std::nullopt, std::nullopt, ContentRecordType::Program, update_tid);
 
         for (const auto& [slot, entry] : all_updates) {
-            if (slot == ContentProviderUnionSlot::External) {
+            if (slot == ContentProviderUnionSlot::External ||
+                slot == ContentProviderUnionSlot::FrontendManual) {
                 continue;
             }
 

src/core/file_sys/registered_cache.cpp

@@ -104,6 +104,206 @@ static std::string GetCNMTName(TitleType type, u64 title_id) {
     return fmt::format("{}_{:016x}.cnmt", TITLE_TYPE_NAMES[index], title_id);
 }
 
+static std::shared_ptr<NSP> OpenContainerAsNsp(const VirtualFile& file, Loader::FileType type) {
+    if (!file) {
+        return nullptr;
+    }
+
+    if (type == Loader::FileType::Unknown || type == Loader::FileType::Error) {
+        type = Loader::IdentifyFile(file);
+        if (type == Loader::FileType::Unknown) {
+            type = Loader::GuessFromFilename(file->GetName());
+        }
+    }
+
+    if (type == Loader::FileType::NSP) {
+        auto nsp = std::make_shared<NSP>(file);
+        return nsp->GetStatus() == Loader::ResultStatus::Success ? nsp : nullptr;
+    }
+
+    if (type == Loader::FileType::XCI) {
+        XCI xci(file);
+        if (xci.GetStatus() != Loader::ResultStatus::Success) {
+            return nullptr;
+        }
+
+        auto secure_partition = xci.GetSecurePartitionNSP();
+        if (secure_partition == nullptr) {
+            return nullptr;
+        }
+
+        return secure_partition;
+    }
+
+    // SAF-backed files can occasionally fail type-guessing despite being valid NSP/XCI.
+    // As a last resort, probe both container parsers directly.
+    {
+        auto nsp = std::make_shared<NSP>(file);
+        if (nsp->GetStatus() == Loader::ResultStatus::Success) {
+            return nsp;
+        }
+    }
+    {
+        XCI xci(file);
+        if (xci.GetStatus() == Loader::ResultStatus::Success) {
+            auto secure_partition = xci.GetSecurePartitionNSP();
+            if (secure_partition != nullptr) {
+                return secure_partition;
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+template <typename Callback>
+bool ForEachContainerEntry(const std::shared_ptr<NSP>& nsp, bool only_content,
+                           std::optional<u64> base_program_id, Callback&& on_entry) {
+    if (!nsp) {
+        return false;
+    }
+
+    const auto& ncas = nsp->GetNCAs();
+    if (ncas.empty()) {
+        return false;
+    }
+
+    std::map<u64, u32> versions;
+    std::map<u64, std::string> version_strings;
+
+    for (const auto& [title_id, nca_map] : ncas) {
+        for (const auto& [type_pair, nca] : nca_map) {
+            if (!nca) {
+                continue;
+            }
+
+            const auto& [title_type, content_type] = type_pair;
+
+            if (content_type == ContentRecordType::Meta) {
+                const auto subdirs = nca->GetSubdirectories();
+                if (!subdirs.empty()) {
+                    for (const auto& inner_file : subdirs[0]->GetFiles()) {
+                        if (inner_file->GetExtension() == "cnmt") {
+                            const CNMT cnmt(inner_file);
+                            versions[cnmt.GetTitleID()] = cnmt.GetTitleVersion();
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (title_type == TitleType::Update && content_type == ContentRecordType::Control) {
+                const auto romfs = nca->GetRomFS();
+                if (!romfs) {
+                    continue;
+                }
+
+                const auto extracted = ExtractRomFS(romfs);
+                if (!extracted) {
+                    continue;
+                }
+
+                auto nacp_file = extracted->GetFile("control.nacp");
+                if (!nacp_file) {
+                    nacp_file = extracted->GetFile("Control.nacp");
+                }
+                if (!nacp_file) {
+                    continue;
+                }
+
+                const NACP nacp(nacp_file);
+                auto version_string = nacp.GetVersionString();
+                if (!version_string.empty()) {
+                    version_strings[title_id] = std::move(version_string);
+                }
+            }
+        }
+    }
+
+    bool added_entries = false;
+    for (const auto& [title_id, nca_map] : ncas) {
+        if (base_program_id.has_value() && GetBaseTitleID(title_id) != *base_program_id) {
+            continue;
+        }
+
+        for (const auto& [type_pair, nca] : nca_map) {
+            const auto& [title_type, content_type] = type_pair;
+            if (only_content && title_type != TitleType::Update && title_type != TitleType::AOC) {
+                continue;
+            }
+
+            auto entry_file = nca ? nca->GetBaseFile() : nullptr;
+            if (!entry_file) {
+                continue;
+            }
+
+            u32 version = 0;
+            std::string version_string;
+
+            if (title_type == TitleType::Update) {
+                if (const auto version_it = versions.find(title_id); version_it != versions.end()) {
+                    version = version_it->second;
+                }
+
+                if (const auto version_str_it = version_strings.find(title_id);
+                    version_str_it != version_strings.end()) {
+                    version_string = version_str_it->second;
+                }
+            }
+
+            on_entry(title_type, content_type, title_id, entry_file, version, version_string);
+            added_entries = true;
+        }
+    }
+
+    return added_entries;
+}
+
+static void UpsertExternalVersionEntry(std::vector<ExternalUpdateEntry>& multi_version_entries,
+                                       u64 title_id, u32 version,
+                                       const std::string& version_string,
+                                       ContentRecordType content_type, const VirtualFile& file) {
+    auto it = std::find_if(multi_version_entries.begin(), multi_version_entries.end(),
+                           [title_id, version](const ExternalUpdateEntry& entry) {
+                               return entry.title_id == title_id && entry.version == version;
+                           });
+
+    if (it == multi_version_entries.end()) {
+        ExternalUpdateEntry update_entry;
+        update_entry.title_id = title_id;
+        update_entry.version = version;
+        update_entry.version_string = version_string;
+        update_entry.files[static_cast<std::size_t>(content_type)] = file;
+        multi_version_entries.push_back(std::move(update_entry));
+        return;
+    }
+
+    it->files[static_cast<std::size_t>(content_type)] = file;
+    if (it->version_string.empty() && !version_string.empty()) {
+        it->version_string = version_string;
+    }
+}
+
+template <typename EntryMap, typename VersionMap>
+static bool AddExternalEntriesFromContainer(const std::shared_ptr<NSP>& nsp, EntryMap& entries,
+                                            VersionMap& versions,
+                                            std::vector<ExternalUpdateEntry>& multi_version_entries) {
+    return ForEachContainerEntry(
+        nsp, true, std::nullopt,
+        [&entries, &versions,
+         &multi_version_entries](TitleType title_type, ContentRecordType content_type, u64 title_id,
+                                 const VirtualFile& file, u32 version,
+                                 const std::string& version_string) {
+            entries[{title_id, content_type, title_type}] = file;
+
+            if (title_type == TitleType::Update) {
+                versions[title_id] = version;
+                UpsertExternalVersionEntry(multi_version_entries, title_id, version, version_string,
+                                           content_type, file);
+            }
+        });
+}
+
 ContentRecordType GetCRTypeFromNCAType(NCAContentType type) {
     switch (type) {
     case NCAContentType::Program:
@@ -1008,6 +1208,26 @@ void ManualContentProvider::AddEntryWithVersion(TitleType title_type, ContentRec
     }
 }
 
+bool ManualContentProvider::AddEntriesFromContainer(VirtualFile file, bool only_content,
+                                                    std::optional<u64> base_program_id) {
+    const auto nsp = OpenContainerAsNsp(file, Loader::FileType::Unknown);
+    if (!nsp) {
+        return false;
+    }
+
+    return ForEachContainerEntry(
+        nsp, only_content, base_program_id,
+        [this](TitleType title_type, ContentRecordType content_type, u64 title_id,
+               const VirtualFile& entry_file, u32 version, const std::string& version_string) {
+            if (title_type == TitleType::Update) {
+                AddEntryWithVersion(title_type, content_type, title_id, version, version_string,
+                                    entry_file);
+            } else {
+                AddEntry(title_type, content_type, title_id, entry_file);
+            }
+        });
+}
+
 void ManualContentProvider::ClearAllEntries() {
     entries.clear();
     multi_version_entries.clear();
@@ -1091,14 +1311,6 @@ VirtualFile ManualContentProvider::GetEntryForVersion(u64 title_id, ContentRecor
     return nullptr;
 }
 
-bool ManualContentProvider::HasMultipleVersions(u64 title_id, ContentRecordType type) const {
-    size_t count = 0;
-    for (const auto& entry : multi_version_entries)
-        if (entry.title_id == title_id && entry.files[size_t(type)])
-            ++count;
-    return count > 0;
-}
-
 ExternalContentProvider::ExternalContentProvider(std::vector<VirtualDir> load_directories)
     : load_dirs(std::move(load_directories)) {
     ExternalContentProvider::Refresh();
@@ -1159,247 +1371,22 @@ void ExternalContentProvider::ScanDirectory(const VirtualDir& dir) {
 }
 
 void ExternalContentProvider::ProcessNSP(const VirtualFile& file) {
-    auto nsp = NSP(file);
-    if (nsp.GetStatus() != Loader::ResultStatus::Success) {
+    const auto nsp = OpenContainerAsNsp(file, Loader::FileType::NSP);
+    if (!nsp) {
         return;
     }
 
     LOG_DEBUG(Service_FS, "Processing NSP file: {}", file->GetName());
-
-    const auto ncas = nsp.GetNCAs();
-
-    std::map<u64, u32> nsp_versions;
-    std::map<u64, std::string> nsp_version_strings;  // title_id -> NACP version string
-
-    for (const auto& [title_id, nca_map] : ncas) {
-        for (const auto& [type_pair, nca] : nca_map) {
-            const auto& [title_type, content_type] = type_pair;
-
-            if (content_type == ContentRecordType::Meta) {
-                const auto subdirs = nca->GetSubdirectories();
-                if (!subdirs.empty()) {
-                    const auto section0 = subdirs[0];
-                    const auto files = section0->GetFiles();
-                    for (const auto& inner_file : files) {
-                        if (inner_file->GetExtension() == "cnmt") {
-                            const CNMT cnmt(inner_file);
-                            const auto cnmt_title_id = cnmt.GetTitleID();
-                            const auto version = cnmt.GetTitleVersion();
-                            nsp_versions[cnmt_title_id] = version;
-                            versions[cnmt_title_id] = version;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (content_type == ContentRecordType::Control && title_type == TitleType::Update) {
-                auto romfs = nca->GetRomFS();
-                if (romfs) {
-                    auto extracted = ExtractRomFS(romfs);
-                    if (extracted) {
-                        auto nacp_file = extracted->GetFile("control.nacp");
-                        if (!nacp_file) {
-                            nacp_file = extracted->GetFile("Control.nacp");
-                        }
-                        if (nacp_file) {
-                            NACP nacp(nacp_file);
-                            auto ver_str = nacp.GetVersionString();
-                            if (!ver_str.empty()) {
-                                nsp_version_strings[title_id] = ver_str;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    std::map<std::pair<u64, u32>, std::array<VirtualFile, size_t(ContentRecordType::Count)>> version_files;
-
-    for (const auto& [title_id, nca_map] : ncas) {
-        for (const auto& [type_pair, nca] : nca_map) {
-            const auto& [title_type, content_type] = type_pair;
-
-            if (title_type != TitleType::AOC && title_type != TitleType::Update) {
-                continue;
-            }
-
-            auto nca_file = nsp.GetNCAFile(title_id, content_type, title_type);
-            if (nca_file != nullptr) {
-                entries[{title_id, content_type, title_type}] = nca_file;
-
-                if (title_type == TitleType::Update) {
-                    u32 version = 0;
-                    auto ver_it = nsp_versions.find(title_id);
-                    if (ver_it != nsp_versions.end()) {
-                        version = ver_it->second;
-                    }
-
-                    version_files[{title_id, version}][size_t(content_type)] = nca_file;
-                }
-
-                LOG_DEBUG(Service_FS, "Added entry - Title ID: {:016X}, Type: {}, Content: {}",
-                          title_id, static_cast<int>(title_type), static_cast<int>(content_type));
-            }
-        }
-    }
-
-    for (const auto& [key, files_map] : version_files) {
-        const auto& [title_id, version] = key;
-
-        std::string ver_str;
-        auto str_it = nsp_version_strings.find(title_id);
-        if (str_it != nsp_version_strings.end()) {
-            ver_str = str_it->second;
-        }
-
-        bool version_exists = false;
-        for (auto& existing : multi_version_entries) {
-            if (existing.title_id == title_id && existing.version == version) {
-                existing.files = files_map;
-                if (existing.version_string.empty() && !ver_str.empty()) {
-                    existing.version_string = ver_str;
-                }
-                version_exists = true;
-                break;
-            }
-        }
-
-        if (!version_exists && !files_map.empty()) {
-            ExternalUpdateEntry update_entry{
-                .title_id = title_id,
-                .version = version,
-                .version_string = ver_str,
-                .files = files_map
-            };
-            multi_version_entries.push_back(update_entry);
-            LOG_DEBUG(Service_FS, "Added multi-version update - Title ID: {:016X}, Version: {}, VersionStr: {}, Content types: {}",
-                      title_id, version, ver_str, files_map.size());
-        }
-    }
+    AddExternalEntriesFromContainer(nsp, entries, versions, multi_version_entries);
 }
 
 void ExternalContentProvider::ProcessXCI(const VirtualFile& file) {
-    auto xci = XCI(file);
-    if (xci.GetStatus() != Loader::ResultStatus::Success) {
+    const auto nsp = OpenContainerAsNsp(file, Loader::FileType::XCI);
+    if (!nsp) {
         return;
     }
 
-    auto nsp = xci.GetSecurePartitionNSP();
-    if (nsp == nullptr) {
-        return;
-    }
-
-    const auto ncas = nsp->GetNCAs();
-
-    std::map<u64, u32> xci_versions;
-    std::map<u64, std::string> xci_version_strings;
-
-    for (const auto& [title_id, nca_map] : ncas) {
-        for (const auto& [type_pair, nca] : nca_map) {
-            const auto& [title_type, content_type] = type_pair;
-
-            if (content_type == ContentRecordType::Meta) {
-                const auto subdirs = nca->GetSubdirectories();
-                if (!subdirs.empty()) {
-                    const auto section0 = subdirs[0];
-                    const auto files = section0->GetFiles();
-                    for (const auto& inner_file : files) {
-                        if (inner_file->GetExtension() == "cnmt") {
-                            const CNMT cnmt(inner_file);
-                            const auto cnmt_title_id = cnmt.GetTitleID();
-                            const auto version = cnmt.GetTitleVersion();
-                            xci_versions[cnmt_title_id] = version;
-                            versions[cnmt_title_id] = version;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (content_type == ContentRecordType::Control && title_type == TitleType::Update) {
-                auto romfs = nca->GetRomFS();
-                if (romfs) {
-                    auto extracted = ExtractRomFS(romfs);
-                    if (extracted) {
-                        auto nacp_file = extracted->GetFile("control.nacp");
-                        if (!nacp_file) {
-                            nacp_file = extracted->GetFile("Control.nacp");
-                        }
-                        if (nacp_file) {
-                            NACP nacp(nacp_file);
-                            auto ver_str = nacp.GetVersionString();
-                            if (!ver_str.empty()) {
-                                xci_version_strings[title_id] = ver_str;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    std::map<std::pair<u64, u32>, std::array<VirtualFile, size_t(ContentRecordType::Count)>> version_files;
-
-    for (const auto& [title_id, nca_map] : ncas) {
-        for (const auto& [type_pair, nca] : nca_map) {
-            const auto& [title_type, content_type] = type_pair;
-
-            if (title_type != TitleType::AOC && title_type != TitleType::Update) {
-                continue;
-            }
-
-            auto nca_file = nsp->GetNCAFile(title_id, content_type, title_type);
-            if (nca_file != nullptr) {
-                entries[{title_id, content_type, title_type}] = nca_file;
-
-                if (title_type == TitleType::Update) {
-                    u32 version = 0;
-                    auto ver_it = xci_versions.find(title_id);
-                    if (ver_it != xci_versions.end()) {
-                        version = ver_it->second;
-                    }
-
-                    version_files[{title_id, version}][size_t(content_type)] = nca_file;
-                }
-            }
-        }
-    }
-
-    for (const auto& [key, files_map] : version_files) {
-        const auto& [title_id, version] = key;
-
-        std::string ver_str;
-        auto str_it = xci_version_strings.find(title_id);
-        if (str_it != xci_version_strings.end()) {
-            ver_str = str_it->second;
-        }
-
-        bool version_exists = false;
-        for (auto& existing : multi_version_entries) {
-            if (existing.title_id == title_id && existing.version == version) {
-                existing.files = files_map;
-                if (existing.version_string.empty() && !ver_str.empty()) {
-                    existing.version_string = ver_str;
-                }
-                version_exists = true;
-                break;
-            }
-        }
-
-        if (!version_exists && !files_map.empty()) {
-            ExternalUpdateEntry update_entry{
-                .title_id = title_id,
-                .version = version,
-                .version_string = ver_str,
-                .files = files_map
-            };
-            multi_version_entries.push_back(update_entry);
-            LOG_DEBUG(Service_FS, "Added multi-version update from XCI - Title ID: {:016X}, Version: {}, VersionStr: {}, Content types: {}",
-                      title_id, version, ver_str, files_map.size());
-        }
-    }
+    AddExternalEntriesFromContainer(nsp, entries, versions, multi_version_entries);
 }
 
 bool ExternalContentProvider::HasEntry(u64 title_id, ContentRecordType type) const {
@@ -1491,12 +1478,4 @@ VirtualFile ExternalContentProvider::GetEntryForVersion(u64 title_id, ContentRec
     return nullptr;
 }
 
-bool ExternalContentProvider::HasMultipleVersions(u64 title_id, ContentRecordType type) const {
-    size_t count = 0;
-    for (const auto& entry : multi_version_entries)
-        if (entry.title_id == title_id && entry.files[size_t(type)])
-            ++count;
-    return count > 1;
-}
-
 } // namespace FileSys

src/core/file_sys/registered_cache.h

@@ -9,6 +9,7 @@
 #include <array>
 #include <functional>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 #include <ankerl/unordered_dense.h>
@@ -262,6 +263,8 @@ public:
                   VirtualFile file);
     void AddEntryWithVersion(TitleType title_type, ContentRecordType content_type, u64 title_id,
                              u32 version, const std::string& version_string, VirtualFile file);
+    bool AddEntriesFromContainer(VirtualFile file, bool only_content = false,
+                                 std::optional<u64> base_program_id = std::nullopt);
     void ClearAllEntries();
 
     void Refresh() override;
@@ -276,7 +279,6 @@ public:
 
     std::vector<ExternalUpdateEntry> ListUpdateVersions(u64 title_id) const;
     VirtualFile GetEntryForVersion(u64 title_id, ContentRecordType type, u32 version) const;
-    bool HasMultipleVersions(u64 title_id, ContentRecordType type) const;
 
 private:
     std::map<std::tuple<TitleType, ContentRecordType, u64>, VirtualFile> entries;
@@ -303,7 +305,6 @@ public:
 
     std::vector<ExternalUpdateEntry> ListUpdateVersions(u64 title_id) const;
     VirtualFile GetEntryForVersion(u64 title_id, ContentRecordType type, u32 version) const;
-    bool HasMultipleVersions(u64 title_id, ContentRecordType type) const;
 
 private:
     void ScanDirectory(const VirtualDir& dir);

src/core/hle/service/prepo/prepo.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -28,8 +28,10 @@ public:
             {10101, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old>, "SaveReportWithUserOld"},
             {10102, &PlayReport::SaveReport<Core::Reporter::PlayReportType::Old2>, "SaveReportOld2"},
             {10103, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old2>, "SaveReportWithUserOld2"},
-            {10104, &PlayReport::SaveReport<Core::Reporter::PlayReportType::New>, "SaveReport"},
-            {10105, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::New>, "SaveReportWithUser"},
+            {10104, &PlayReport::SaveReport<Core::Reporter::PlayReportType::Old3>, "SaveReportOld3"},
+            {10105, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old3>, "SaveReportWithUserOld3"},
+            {10106, &PlayReport::SaveReport<Core::Reporter::PlayReportType::New>, "SaveReport"},
+            {10107, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::New>, "SaveReportWithUser"},
             {10200, &PlayReport::RequestImmediateTransmission, "RequestImmediateTransmission"},
             {10300, &PlayReport::GetTransmissionStatus, "GetTransmissionStatus"},
             {10400, &PlayReport::GetSystemSessionId, "GetSystemSessionId"},

src/core/loader/loader.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -9,11 +9,15 @@
 #include <ostream>
 #include <string>
 #include <concepts>
+#include <algorithm>
 #include "common/concepts.h"
 #include "common/fs/path_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
 #include "core/core.h"
+#include "core/file_sys/card_image.h"
+#include "core/file_sys/common_funcs.h"
+#include "core/file_sys/submission_package.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/loader/deconstructed_rom_directory.h"
 #include "core/loader/kip.h"
@@ -37,6 +41,49 @@ std::optional<FileType> IdentifyFileLoader(FileSys::VirtualFile file) {
     return std::nullopt;
 }
 
+std::shared_ptr<FileSys::NSP> OpenContainerAsNsp(FileSys::VirtualFile file, FileType type,
+                                                 u64 program_id = 0,
+                                                 std::size_t program_index = 0) {
+    if (!file) {
+        return nullptr;
+    }
+
+    if (type == FileType::NSP) {
+        auto nsp = std::make_shared<FileSys::NSP>(file, program_id, program_index);
+        return nsp->GetStatus() == ResultStatus::Success ? nsp : nullptr;
+    }
+
+    if (type == FileType::XCI) {
+        FileSys::XCI xci{file, program_id, program_index};
+        if (xci.GetStatus() != ResultStatus::Success) {
+            return nullptr;
+        }
+
+        auto secure_nsp = xci.GetSecurePartitionNSP();
+        if (secure_nsp == nullptr || secure_nsp->GetStatus() != ResultStatus::Success) {
+            return nullptr;
+        }
+
+        return secure_nsp;
+    }
+
+    return nullptr;
+}
+
+bool HasApplicationProgramContent(const std::shared_ptr<FileSys::NSP>& nsp) {
+    if (!nsp) {
+        return false;
+    }
+
+    const auto& ncas = nsp->GetNCAs();
+    return std::any_of(ncas.cbegin(), ncas.cend(), [](const auto& title_entry) {
+        const auto& nca_map = title_entry.second;
+        return nca_map.find(
+                   {FileSys::TitleType::Application, FileSys::ContentRecordType::Program}) !=
+               nca_map.end();
+    });
+}
+
 } // namespace
 
 FileType IdentifyFile(FileSys::VirtualFile file) {
@@ -62,6 +109,27 @@ FileType IdentifyFile(FileSys::VirtualFile file) {
     }
 }
 
+bool IsContainerType(FileType type) {
+    return type == FileType::NSP || type == FileType::XCI;
+}
+
+bool IsBootableGameContainer(FileSys::VirtualFile file, FileType type, u64 program_id,
+                             std::size_t program_index) {
+    if (!file) {
+        return false;
+    }
+
+    if (type == FileType::Unknown) {
+        type = IdentifyFile(file);
+    }
+
+    if (!IsContainerType(type)) {
+        return false;
+    }
+
+    return HasApplicationProgramContent(OpenContainerAsNsp(file, type, program_id, program_index));
+}
+
 FileType GuessFromFilename(const std::string& name) {
     if (name == "main")
         return FileType::DeconstructedRomDirectory;

src/core/loader/loader.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -46,12 +49,29 @@ enum class FileType {
 };
 
 /**
- * Identifies the type of a bootable file based on the magic value in its header.
+ * Identifies the type of a supported file/container based on its structure.
  * @param file open file
  * @return FileType of file
  */
 FileType IdentifyFile(FileSys::VirtualFile file);
 
+/**
+ * Returns whether the file type represents a container format that can bundle multiple titles
+ * (currently NSP/XCI).
+ */
+bool IsContainerType(FileType type);
+
+/**
+ * Returns whether a container file is bootable as a game (has Application/Program content).
+ *
+ * @param file open file
+ * @param type optional file type; if Unknown it is auto-detected.
+ * @param program_id optional program id hint for multi-program containers.
+ * @param program_index optional program index hint for multi-program containers.
+ */
+bool IsBootableGameContainer(FileSys::VirtualFile file, FileType type = FileType::Unknown,
+                             u64 program_id = 0, std::size_t program_index = 0);
+
 /**
  * Guess the type of a bootable file from its name
  * @param name String name of bootable file

src/core/loader/nsp.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -55,19 +58,30 @@ AppLoader_NSP::~AppLoader_NSP() = default;
 FileType AppLoader_NSP::IdentifyType(const FileSys::VirtualFile& nsp_file) {
     const FileSys::NSP nsp(nsp_file);
 
-    if (nsp.GetStatus() == ResultStatus::Success) {
-        // Extracted Type case
-        if (nsp.IsExtractedType() && nsp.GetExeFS() != nullptr &&
-            FileSys::IsDirectoryExeFS(nsp.GetExeFS())) {
-            return FileType::NSP;
+    if (nsp.GetStatus() != ResultStatus::Success) {
+        return FileType::Error;
+    }
+
+    // Extracted Type case
+    if (nsp.IsExtractedType() && nsp.GetExeFS() != nullptr &&
+        FileSys::IsDirectoryExeFS(nsp.GetExeFS())) {
+        return FileType::NSP;
+    }
+
+    // Non-extracted NSPs can legitimately contain only update/DLC content.
+    // Identify the container format itself; bootability is validated by Load().
+    if (!nsp.GetNCAs().empty()) {
+        return FileType::NSP;
+    }
+
+    // Fallback when NCAs couldn't be parsed (e.g. missing keys) but the PFS still contains NCAs.
+    for (const auto& entry : nsp.GetFiles()) {
+        if (entry == nullptr) {
+            continue;
         }
 
-        // Non-Extracted Type case
-        const auto program_id = nsp.GetProgramTitleID();
-        if (!nsp.IsExtractedType() &&
-            nsp.GetNCA(program_id, FileSys::ContentRecordType::Program) != nullptr &&
-            AppLoader_NCA::IdentifyType(
-                nsp.GetNCAFile(program_id, FileSys::ContentRecordType::Program)) == FileType::NCA) {
+        const auto& name = entry->GetName();
+        if (name.size() >= 4 && name.substr(name.size() - 4) == ".nca") {
             return FileType::NSP;
         }
     }

src/core/loader/xci.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -44,10 +47,13 @@ AppLoader_XCI::~AppLoader_XCI() = default;
 FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& xci_file) {
     const FileSys::XCI xci(xci_file);
 
-    if (xci.GetStatus() == ResultStatus::Success &&
-        xci.GetNCAByType(FileSys::NCAContentType::Program) != nullptr &&
-        AppLoader_NCA::IdentifyType(xci.GetNCAFileByType(FileSys::NCAContentType::Program)) ==
-            FileType::NCA) {
+    if (xci.GetStatus() != ResultStatus::Success) {
+        return FileType::Error;
+    }
+
+    // Identify XCI as a valid container even when it does not include a bootable Program NCA.
+    // Bootability is handled by AppLoader_XCI::Load().
+    if (xci.GetSecurePartitionNSP() != nullptr) {
         return FileType::XCI;
     }
 

src/core/reporter.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -53,6 +56,7 @@ public:
     enum class PlayReportType {
         Old,
         Old2,
+        Old3,
         New,
         System,
     };

src/dynarmic/src/dynarmic/CMakeLists.txt

@@ -69,6 +69,7 @@ add_library(dynarmic STATIC
     frontend/decoder/matcher.h
     frontend/imm.cpp
     frontend/imm.h
+    interface/halt_reason.h
     interface/exclusive_monitor.h
     interface/optimization_flags.h
     ir/acc_type.h

src/ios/AppUI-Bridging-Header.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  AppUI-Bridging-Header.h - Sudachi
+//  Created by Jarrod Norwell on 4/3/2024.
+//
+
+#ifndef AppUI_Bridging_Header_h
+#define AppUI_Bridging_Header_h
+
+#import "Wrapper/AppUIObjC.h"
+
+#endif /* AppUI_Bridging_Header_h */

src/ios/AppUI.swift

@@ -0,0 +1,107 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  AppUI.swift - Sudachi
+//  Created by Jarrod Norwell on 4/3/2024.
+//
+
+import Foundation
+import QuartzCore.CAMetalLayer
+
+public struct AppUI {
+
+    public static let shared = AppUI()
+
+    fileprivate let appUIObjC = AppUIObjC.shared()
+
+    public func configure(layer: CAMetalLayer, with size: CGSize) {
+        appUIObjC.configure(layer: layer, with: size)
+    }
+
+    public func information(for url: URL) -> AppUIInformation {
+        appUIObjC.gameInformation.information(for: url)
+    }
+
+    public func insert(game url: URL) {
+        appUIObjC.insert(game: url)
+    }
+
+    public func insert(games urls: [URL]) {
+        appUIObjC.insert(games: urls)
+    }
+
+    public func bootOS() {
+        appUIObjC.bootOS()
+    }
+
+    public func pause() {
+        appUIObjC.pause()
+    }
+
+    public func play() {
+        appUIObjC.play()
+    }
+
+    public func ispaused() -> Bool {
+        return appUIObjC.ispaused()
+    }
+
+    public func FirstFrameShowed() -> Bool {
+        return appUIObjC.hasfirstfame()
+    }
+
+    public func canGetFullPath() -> Bool {
+        return appUIObjC.canGetFullPath()
+    }
+
+
+    public func exit() {
+        appUIObjC.quit()
+    }
+
+    public func step() {
+        appUIObjC.step()
+    }
+
+    public func orientationChanged(orientation: UIInterfaceOrientation, with layer: CAMetalLayer, size: CGSize) {
+        appUIObjC.orientationChanged(orientation: orientation, with: layer, size: size)
+    }
+
+    public func touchBegan(at point: CGPoint, for index: UInt) {
+        appUIObjC.touchBegan(at: point, for: index)
+    }
+
+    public func touchEnded(for index: UInt) {
+        appUIObjC.touchEnded(for: index)
+    }
+
+    public func touchMoved(at point: CGPoint, for index: UInt) {
+        appUIObjC.touchMoved(at: point, for: index)
+    }
+
+    public func gyroMoved(x: Float, y: Float, z: Float, accelX: Float, accelY: Float, accelZ: Float, controllerId: Int32, deltaTimestamp: Int32) {
+        // Calling the Objective-C function with both gyroscope and accelerometer data
+        appUIObjC.virtualControllerGyro(controllerId,
+            deltaTimestamp: deltaTimestamp,
+            gyroX: x, gyroY: y, gyroZ: z,
+            accelX: accelX, accelY: accelY, accelZ: accelZ)
+    }
+
+
+    public func thumbstickMoved(analog: VirtualControllerAnalogType, x: Float, y: Float, controllerid: Int) {
+        appUIObjC.thumbstickMoved(analog, x: CGFloat(x), y: CGFloat(y), controllerId: Int32(controllerid))
+    }
+
+    public func virtualControllerButtonDown(button: VirtualControllerButtonType, controllerid: Int) {
+        appUIObjC.virtualControllerButtonDown(button, controllerId: Int32(controllerid))
+    }
+
+    public func virtualControllerButtonUp(button: VirtualControllerButtonType, controllerid: Int) {
+        appUIObjC.virtualControllerButtonUp(button, controllerId: Int32(controllerid))
+    }
+
+    public func settingsSaved() {
+        appUIObjC.settingsChanged()
+    }
+}

src/ios/AppUIGameInformation.h

@@ -0,0 +1,29 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  AppUIGameInformation.h - Sudachi
+//  Created by Jarrod Norwell on 1/20/24.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AppUIInformation : NSObject
+@property (nonatomic, strong) NSString *developer;
+@property (nonatomic, strong) NSData *iconData;
+@property (nonatomic) BOOL isHomebrew;
+@property (nonatomic) uint64_t programID;
+@property (nonatomic, strong) NSString *title, *version;
+
+-(AppUIInformation *) initWithDeveloper:(NSString *)developer iconData:(NSData *)iconData isHomebrew:(BOOL)isHomebrew programID:(uint64_t)programID title:(NSString *)title version:(NSString *)version;
+@end
+
+@interface AppUIGameInformation : NSObject
++(AppUIGameInformation *) sharedInstance NS_SWIFT_NAME(shared());
+
+-(AppUIInformation *) informationForGame:(NSURL *)url NS_SWIFT_NAME(information(for:));
+@end
+
+NS_ASSUME_NONNULL_END

src/ios/AppUIGameInformation.mm

@@ -0,0 +1,442 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  AppUIGameInformation.mm - Sudachi
+//  Created by Jarrod Norwell on 1/20/24.
+//
+
+#import <Foundation/Foundation.h>
+#import "AppUIGameInformation.h"
+#import "EmulationSession/EmulationSession.h"
+
+#include "common/fs/fs.h"
+#include "common/fs/path_util.h"
+#include "core/core.h"
+#include "core/file_sys/fs_filesystem.h"
+#include "core/file_sys/patch_manager.h"
+#include "core/loader/loader.h"
+#include "core/loader/nro.h"
+#include "frontend_common/yuzu_config.h"
+
+struct GameMetadata {
+    std::string title;
+    u64 programId;
+    std::string developer;
+    std::string version;
+    std::vector<u8> icon;
+    bool isHomebrew;
+};
+
+
+class SdlConfig final : public Config {
+public:
+    explicit SdlConfig(std::optional<std::string> config_path);
+    ~SdlConfig() override;
+
+    void ReloadAllValues() override;
+    void SaveAllValues() override;
+
+protected:
+    void ReadSdlValues();
+    void ReadSdlPlayerValues(std::size_t player_index);
+    void ReadSdlControlValues();
+    void ReadHidbusValues() override;
+    void ReadDebugControlValues() override;
+    void ReadPathValues() override {}
+    void ReadShortcutValues() override {}
+    void ReadUIValues() override {}
+    void ReadUIGamelistValues() override {}
+    void ReadUILayoutValues() override {}
+    void ReadMultiplayerValues() override {}
+
+    void SaveSdlValues();
+    void SaveSdlPlayerValues(std::size_t player_index);
+    void SaveSdlControlValues();
+    void SaveHidbusValues() override;
+    void SaveDebugControlValues() override;
+    void SavePathValues() override {}
+    void SaveShortcutValues() override {}
+    void SaveUIValues() override {}
+    void SaveUIGamelistValues() override {}
+    void SaveUILayoutValues() override {}
+    void SaveMultiplayerValues() override {}
+
+    std::vector<Settings::BasicSetting*>& FindRelevantList(Settings::Category category) override;
+
+public:
+    static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
+    static const std::array<int, Settings::NativeMotion::NumMotions> default_motions;
+    static const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> default_analogs;
+    static const std::array<int, 2> default_stick_mod;
+    static const std::array<int, 2> default_ringcon_analogs;
+};
+
+
+#define SDL_MAIN_HANDLED
+#include <SDL.h>
+
+#include "common/logging/log.h"
+#include "input_common/main.h"
+
+const std::array<int, Settings::NativeButton::NumButtons> SdlConfig::default_buttons = {
+    SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_Z, SDL_SCANCODE_X, SDL_SCANCODE_T,
+    SDL_SCANCODE_G, SDL_SCANCODE_F, SDL_SCANCODE_H, SDL_SCANCODE_Q, SDL_SCANCODE_W,
+    SDL_SCANCODE_M, SDL_SCANCODE_N, SDL_SCANCODE_1, SDL_SCANCODE_2, SDL_SCANCODE_B,
+};
+
+const std::array<int, Settings::NativeMotion::NumMotions> SdlConfig::default_motions = {
+    SDL_SCANCODE_7,
+    SDL_SCANCODE_8,
+};
+
+const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> SdlConfig::default_analogs{
+    {
+        {
+            SDL_SCANCODE_UP,
+            SDL_SCANCODE_DOWN,
+            SDL_SCANCODE_LEFT,
+            SDL_SCANCODE_RIGHT,
+        },
+        {
+            SDL_SCANCODE_I,
+            SDL_SCANCODE_K,
+            SDL_SCANCODE_J,
+            SDL_SCANCODE_L,
+        },
+    }};
+
+const std::array<int, 2> SdlConfig::default_stick_mod = {
+    SDL_SCANCODE_D,
+    0,
+};
+
+const std::array<int, 2> SdlConfig::default_ringcon_analogs{{
+    0,
+    0,
+}};
+
+SdlConfig::SdlConfig(const std::optional<std::string> config_path) {
+    Initialize(config_path);
+    ReadSdlValues();
+    SaveSdlValues();
+}
+
+SdlConfig::~SdlConfig() {
+    if (global) {
+        SdlConfig::SaveAllValues();
+    }
+}
+
+void SdlConfig::ReloadAllValues() {
+    Reload();
+    ReadSdlValues();
+    SaveSdlValues();
+}
+
+void SdlConfig::SaveAllValues() {
+    SaveValues();
+    SaveSdlValues();
+}
+
+void SdlConfig::ReadSdlValues() {
+    ReadSdlControlValues();
+}
+
+void SdlConfig::ReadSdlControlValues() {
+    BeginGroup(Settings::TranslateCategory(Settings::Category::Controls));
+
+    Settings::values.players.SetGlobal(!IsCustomConfig());
+    for (std::size_t p = 0; p < Settings::values.players.GetValue().size(); ++p) {
+        ReadSdlPlayerValues(p);
+    }
+    if (IsCustomConfig()) {
+        EndGroup();
+        return;
+    }
+    ReadDebugControlValues();
+    ReadHidbusValues();
+
+    EndGroup();
+}
+
+void SdlConfig::ReadSdlPlayerValues(const std::size_t player_index) {
+    std::string player_prefix;
+    if (type != ConfigType::InputProfile) {
+        player_prefix.append("player_").append(ToString(player_index)).append("_");
+    }
+
+    auto& player = Settings::values.players.GetValue()[player_index];
+    if (IsCustomConfig()) {
+        const auto profile_name =
+            ReadStringSetting(std::string(player_prefix).append("profile_name"));
+        if (profile_name.empty()) {
+            // Use the global input config
+            player = Settings::values.players.GetValue(true)[player_index];
+            player.profile_name = "";
+            return;
+        }
+    }
+
+    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
+        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
+        auto& player_buttons = player.buttons[i];
+
+        player_buttons = ReadStringSetting(
+            std::string(player_prefix).append(Settings::NativeButton::mapping[i]), default_param);
+        if (player_buttons.empty()) {
+            player_buttons = default_param;
+        }
+    }
+
+    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
+        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
+            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
+            default_analogs[i][3], default_stick_mod[i], 0.5f);
+        auto& player_analogs = player.analogs[i];
+
+        player_analogs = ReadStringSetting(
+            std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]), default_param);
+        if (player_analogs.empty()) {
+            player_analogs = default_param;
+        }
+    }
+
+    for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
+        const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]);
+        auto& player_motions = player.motions[i];
+
+        player_motions = ReadStringSetting(
+            std::string(player_prefix).append(Settings::NativeMotion::mapping[i]), default_param);
+        if (player_motions.empty()) {
+            player_motions = default_param;
+        }
+    }
+}
+
+void SdlConfig::ReadDebugControlValues() {
+    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
+        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
+        auto& debug_pad_buttons = Settings::values.debug_pad_buttons[i];
+        debug_pad_buttons = ReadStringSetting(
+            std::string("debug_pad_").append(Settings::NativeButton::mapping[i]), default_param);
+        if (debug_pad_buttons.empty()) {
+            debug_pad_buttons = default_param;
+        }
+    }
+    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
+        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
+            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
+            default_analogs[i][3], default_stick_mod[i], 0.5f);
+        auto& debug_pad_analogs = Settings::values.debug_pad_analogs[i];
+        debug_pad_analogs = ReadStringSetting(
+            std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]), default_param);
+        if (debug_pad_analogs.empty()) {
+            debug_pad_analogs = default_param;
+        }
+    }
+}
+
+void SdlConfig::ReadHidbusValues() {
+    const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
+        0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f);
+    auto& ringcon_analogs = Settings::values.ringcon_analogs;
+
+    ringcon_analogs = ReadStringSetting(std::string("ring_controller"), default_param);
+    if (ringcon_analogs.empty()) {
+        ringcon_analogs = default_param;
+    }
+}
+
+void SdlConfig::SaveSdlValues() {
+    LOG_DEBUG(Config, "Saving SDL configuration values");
+    SaveSdlControlValues();
+
+    WriteToIni();
+}
+
+void SdlConfig::SaveSdlControlValues() {
+    BeginGroup(Settings::TranslateCategory(Settings::Category::Controls));
+
+    Settings::values.players.SetGlobal(!IsCustomConfig());
+    for (std::size_t p = 0; p < Settings::values.players.GetValue().size(); ++p) {
+        SaveSdlPlayerValues(p);
+    }
+    if (IsCustomConfig()) {
+        EndGroup();
+        return;
+    }
+    SaveDebugControlValues();
+    SaveHidbusValues();
+
+    EndGroup();
+}
+
+void SdlConfig::SaveSdlPlayerValues(const std::size_t player_index) {
+    std::string player_prefix;
+    if (type != ConfigType::InputProfile) {
+        player_prefix = std::string("player_").append(ToString(player_index)).append("_");
+    }
+
+    const auto& player = Settings::values.players.GetValue()[player_index];
+    if (IsCustomConfig() && player.profile_name.empty()) {
+        // No custom profile selected
+        return;
+    }
+
+    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
+        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
+        WriteStringSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]),
+                           player.buttons[i], std::make_optional(default_param));
+    }
+    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
+        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
+            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
+            default_analogs[i][3], default_stick_mod[i], 0.5f);
+        WriteStringSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]),
+                           player.analogs[i], std::make_optional(default_param));
+    }
+    for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) {
+        const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]);
+        WriteStringSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]),
+                           player.motions[i], std::make_optional(default_param));
+    }
+}
+
+void SdlConfig::SaveDebugControlValues() {
+    for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) {
+        const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]);
+        WriteStringSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]),
+                           Settings::values.debug_pad_buttons[i],
+                           std::make_optional(default_param));
+    }
+    for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) {
+        const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
+            default_analogs[i][0], default_analogs[i][1], default_analogs[i][2],
+            default_analogs[i][3], default_stick_mod[i], 0.5f);
+        WriteStringSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]),
+                           Settings::values.debug_pad_analogs[i],
+                           std::make_optional(default_param));
+    }
+}
+
+void SdlConfig::SaveHidbusValues() {
+    const std::string default_param = InputCommon::GenerateAnalogParamFromKeys(
+        0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f);
+    WriteStringSetting(std::string("ring_controller"), Settings::values.ringcon_analogs,
+                       std::make_optional(default_param));
+}
+
+std::vector<Settings::BasicSetting*>& SdlConfig::FindRelevantList(Settings::Category category) {
+    return Settings::values.linkage.by_category[category];
+}
+
+
+
+
+
+
+
+std::unordered_map<std::string, GameMetadata> m_game_metadata_cache;
+
+GameMetadata CacheGameMetadata(const std::string& path) {
+    const auto file =
+        Core::GetGameFileFromPath(EmulationSession::GetInstance().System().GetFilesystem(), path);
+    auto loader = Loader::GetLoader(EmulationSession::GetInstance().System(), file, 0, 0);
+
+    GameMetadata entry;
+    loader->ReadTitle(entry.title);
+    loader->ReadProgramId(entry.programId);
+    loader->ReadIcon(entry.icon);
+
+    const FileSys::PatchManager pm{
+        entry.programId, EmulationSession::GetInstance().System().GetFileSystemController(),
+        EmulationSession::GetInstance().System().GetContentProvider()};
+    const auto control = pm.GetControlMetadata();
+
+    if (control.first != nullptr) {
+        entry.developer = control.first->GetDeveloperName();
+        entry.version = control.first->GetVersionString();
+    } else {
+        FileSys::NACP nacp;
+        if (loader->ReadControlData(nacp) == Loader::ResultStatus::Success) {
+            entry.developer = nacp.GetDeveloperName();
+        } else {
+            entry.developer = "";
+        }
+
+        entry.version = "1.0.0";
+    }
+
+    if (loader->GetFileType() == Loader::FileType::NRO) {
+        auto loader_nro = reinterpret_cast<Loader::AppLoader_NRO*>(loader.get());
+        entry.isHomebrew = loader_nro->IsHomebrew();
+    } else {
+        entry.isHomebrew = false;
+    }
+
+    m_game_metadata_cache[path] = entry;
+
+    return entry;
+}
+
+GameMetadata GameMetadata(const std::string& path, bool reload = false) {
+    if (!EmulationSession::GetInstance().IsInitialized()) {
+        NSURL *dir_url = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
+        const char *directory_cstr = [[dir_url path] UTF8String];
+        Common::FS::SetAppDirectory(directory_cstr);
+
+        EmulationSession::GetInstance().System().Initialize();
+        EmulationSession::GetInstance().InitializeSystem(false);
+    }
+
+    if (reload) {
+        return CacheGameMetadata(path);
+    }
+
+    if (auto search = m_game_metadata_cache.find(path); search != m_game_metadata_cache.end()) {
+        return search->second;
+    }
+
+    return CacheGameMetadata(path);
+}
+
+
+@implementation AppUIInformation
+-(AppUIInformation *) initWithDeveloper:(NSString *)developer iconData:(NSData *)iconData isHomebrew:(BOOL)isHomebrew programID:(uint64_t)programID
+                                    title:(NSString *)title version:(NSString *)version {
+    if (self = [super init]) {
+        self.developer = developer;
+        self.iconData = iconData;
+        self.isHomebrew = isHomebrew;
+        self.programID = programID;
+        self.title = title;
+        self.version = version;
+    } return self;
+}
+@end
+
+@implementation AppUIGameInformation
++(AppUIGameInformation *) sharedInstance {
+    static AppUIGameInformation *sharedInstance = NULL;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self alloc] init];
+    });
+    return sharedInstance;
+}
+
+
+-(AppUIInformation *) informationForGame:(NSURL *)url {
+    auto gameMetadata = GameMetadata([url.path UTF8String]);
+
+    return [[AppUIInformation alloc] initWithDeveloper:[NSString stringWithCString:gameMetadata.developer.c_str() encoding:NSUTF8StringEncoding]
+                                                iconData:[NSData dataWithBytes:gameMetadata.icon.data() length:gameMetadata.icon.size()]
+                                              isHomebrew:gameMetadata.isHomebrew programID:gameMetadata.programId
+                                                   title:[NSString stringWithCString:gameMetadata.title.c_str() encoding:NSUTF8StringEncoding]
+                                                 version:[NSString stringWithCString:gameMetadata.version.c_str() encoding:NSUTF8StringEncoding]];
+}
+@end

src/ios/AppUIObjC.h

@@ -0,0 +1,95 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  AppUIObjC.h - Sudachi
+//  Created by Jarrod Norwell on 1/8/24.
+//
+
+#import <Foundation/Foundation.h>
+#import <MetalKit/MetalKit.h>
+
+#import "AppUIGameInformation/AppUIGameInformation.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSUInteger, VirtualControllerAnalogType) {
+    VirtualControllerAnalogTypeLeft = 0,
+    VirtualControllerAnalogTypeRight = 1
+};
+
+typedef NS_ENUM(NSUInteger, VirtualControllerButtonType) {
+    VirtualControllerButtonTypeA = 0,
+    VirtualControllerButtonTypeB = 1,
+    VirtualControllerButtonTypeX = 2,
+    VirtualControllerButtonTypeY = 3,
+    VirtualControllerButtonTypeL = 4,
+    VirtualControllerButtonTypeR = 5,
+    VirtualControllerButtonTypeTriggerL = 6,
+    VirtualControllerButtonTypeTriggerR = 7,
+    VirtualControllerButtonTypeTriggerZL = 8,
+    VirtualControllerButtonTypeTriggerZR = 9,
+    VirtualControllerButtonTypePlus = 10,
+    VirtualControllerButtonTypeMinus = 11,
+    VirtualControllerButtonTypeDirectionalPadLeft = 12,
+    VirtualControllerButtonTypeDirectionalPadUp = 13,
+    VirtualControllerButtonTypeDirectionalPadRight = 14,
+    VirtualControllerButtonTypeDirectionalPadDown = 15,
+    VirtualControllerButtonTypeSL = 16,
+    VirtualControllerButtonTypeSR = 17,
+    VirtualControllerButtonTypeHome = 18,
+    VirtualControllerButtonTypeCapture = 19
+};
+
+@interface AppUIObjC : NSObject {
+    CAMetalLayer *_layer;
+    CGSize _size;
+}
+
+@property (nonatomic, strong) AppUIGameInformation *gameInformation;
+
++(AppUIObjC *) sharedInstance NS_SWIFT_NAME(shared());
+-(void) configureLayer:(CAMetalLayer *)layer withSize:(CGSize)size NS_SWIFT_NAME(configure(layer:with:));
+-(void) bootOS;
+-(void) pause;
+-(void) play;
+-(BOOL) ispaused;
+-(BOOL) canGetFullPath;
+-(void) quit;
+-(void) insertGame:(NSURL *)url NS_SWIFT_NAME(insert(game:));
+-(void) insertGames:(NSArray<NSURL *> *)games NS_SWIFT_NAME(insert(games:));
+-(void) step;
+-(BOOL) hasfirstfame;
+
+-(void) touchBeganAtPoint:(CGPoint)point index:(NSUInteger)index NS_SWIFT_NAME(touchBegan(at:for:));
+-(void) touchEndedForIndex:(NSUInteger)index;
+-(void) touchMovedAtPoint:(CGPoint)point index:(NSUInteger)index NS_SWIFT_NAME(touchMoved(at:for:));
+
+-(void) thumbstickMoved:(VirtualControllerAnalogType)analog
+                      x:(CGFloat)x
+                      y:(CGFloat)y
+             controllerId:(int)controllerId;
+
+-(void) virtualControllerGyro:(int)controllerId
+            deltaTimestamp:(int)delta_timestamp
+                    gyroX:(float)gyro_x
+                    gyroY:(float)gyro_y
+                    gyroZ:(float)gyro_z
+                  accelX:(float)accel_x
+                  accelY:(float)accel_y
+                       accelZ:(float)accel_z;
+
+-(void) virtualControllerButtonDown:(VirtualControllerButtonType)button
+                       controllerId:(int)controllerId;
+
+-(void) virtualControllerButtonUp:(VirtualControllerButtonType)button
+                     controllerId:(int)controllerId;
+
+
+-(void) orientationChanged:(UIInterfaceOrientation)orientation with:(CAMetalLayer *)layer size:(CGSize)size NS_SWIFT_NAME(orientationChanged(orientation:with:size:));
+
+-(void) settingsChanged;
+
+@end
+
+NS_ASSUME_NONNULL_END

src/ios/AppUIObjC.mm

@@ -0,0 +1,263 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  AppUIObjC.mm - Sudachi
+//  Created by Jarrod Norwell on 1/8/24.
+//
+
+#import "AppUIObjC.h"
+
+#import "Config/Config.h"
+#import "EmulationSession/EmulationSession.h"
+#import "DirectoryManager/DirectoryManager.h"
+
+#include "common/fs/fs.h"
+#include "common/fs/path_util.h"
+#include "common/settings.h"
+#include "common/fs/fs.h"
+#include "core/file_sys/patch_manager.h"
+#include "core/file_sys/savedata_factory.h"
+#include "core/loader/nro.h"
+#include "frontend_common/content_manager.h"
+#include "common/settings_enums.h"
+#include "network/announce_multiplayer_session.h"
+#include "common/announce_multiplayer_room.h"
+#include "network/network.h"
+
+#include "common/detached_tasks.h"
+#include "common/dynamic_library.h"
+#include "common/fs/path_util.h"
+#include "common/logging/backend.h"
+#include "common/logging/log.h"
+#include "common/microprofile.h"
+#include "common/scm_rev.h"
+#include "common/scope_exit.h"
+#include "common/settings.h"
+#include "common/string_util.h"
+#include "core/core.h"
+#include "core/cpu_manager.h"
+#include "core/crypto/key_manager.h"
+#include "core/file_sys/card_image.h"
+#include "core/file_sys/content_archive.h"
+#include "core/file_sys/fs_filesystem.h"
+#include "core/file_sys/submission_package.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/vfs_real.h"
+#include "core/frontend/applets/cabinet.h"
+#include "core/frontend/applets/controller.h"
+#include "core/frontend/applets/error.h"
+#include "core/frontend/applets/general.h"
+#include "core/frontend/applets/mii_edit.h"
+#include "core/frontend/applets/profile_select.h"
+#include "core/frontend/applets/software_keyboard.h"
+#include "core/frontend/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"
+#include "core/loader/loader.h"
+#include "frontend_common/yuzu_config.h"
+#include "hid_core/frontend/emulated_controller.h"
+#include "hid_core/hid_core.h"
+#include "hid_core/hid_types.h"
+#include "video_core/renderer_base.h"
+#include "video_core/renderer_vulkan/renderer_vulkan.h"
+#include "video_core/vulkan_common/vulkan_instance.h"
+#include "video_core/vulkan_common/vulkan_surface.h"
+
+
+#import <mach/mach.h>
+
+@implementation AppUIObjC
+-(AppUIObjC *) init {
+    if (self = [super init]) {
+        _gameInformation = [AppUIGameInformation sharedInstance];
+
+        NSURL *dir_url = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
+        const char *directory_cstr = [[dir_url path] UTF8String];
+
+        Common::FS::SetAppDirectory(directory_cstr);
+        Config{"config", Config::ConfigType::GlobalConfig};
+
+        EmulationSession::GetInstance().System().Initialize();
+        EmulationSession::GetInstance().InitializeSystem(false);
+        EmulationSession::GetInstance().InitializeGpuDriver();
+
+
+        Settings::values.dump_shaders.SetValue(true);
+        Settings::values.use_asynchronous_shaders.SetValue(true);
+        // Settings::values.astc_recompression.SetValue(Settings::AstcRecompression::Bc3);
+        Settings::values.shader_backend.SetValue(Settings::ShaderBackend::SpirV);
+        // Settings::values.resolution_setup.SetValue(Settings::ResolutionSetup::Res1X);
+        // Settings::values.scaling_filter.SetValue(Settings::ScalingFilter::Bilinear);
+    } return self;
+}
+
+
++(AppUIObjC *) sharedInstance {
+    static AppUIObjC *sharedInstance = NULL;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self alloc] init];
+    });
+    return sharedInstance;
+}
+
+- (BOOL)ispaused {
+    return EmulationSession::GetInstance().IsPaused();
+}
+
+-(void) pause {
+    EmulationSession::GetInstance().System().Pause();
+    EmulationSession::GetInstance().HaltEmulation();
+    EmulationSession::GetInstance().PauseEmulation();
+}
+
+-(void) play {
+
+    EmulationSession::GetInstance().System().Run();
+    EmulationSession::GetInstance().RunEmulation();
+    EmulationSession::GetInstance().UnPauseEmulation();
+}
+
+-(BOOL)hasfirstfame {
+    @try {
+        auto* window = &EmulationSession::GetInstance().Window();
+        if (window && window->HasFirstFrame()) {
+            return YES;
+        }
+    }
+    @catch (NSException *exception) {
+        NSLog(@"Exception occurred: %@", exception);
+        // Handle the exception, maybe return a default value
+        return NO;
+    }
+    return NO;
+}
+
+- (BOOL)canGetFullPath {
+    @try {
+        Core::System& system = EmulationSession::GetInstance().System();
+        auto bis_system = system.GetFileSystemController().GetSystemNANDContents();
+
+        if (bis_system == nullptr) {
+            return NO;
+        }
+
+        constexpr u64 QLaunchId = static_cast<u64>(Service::AM::AppletProgramId::QLaunch);
+        auto qlaunch_applet_nca = bis_system->GetEntry(QLaunchId, FileSys::ContentRecordType::Program);
+
+        if (qlaunch_applet_nca == nullptr) {
+            return NO;
+        }
+
+        const auto filename = qlaunch_applet_nca->GetFullPath();
+
+        // If GetFullPath() is successful
+        return YES;
+    } @catch (NSException *exception) {
+        // Handle the exception if needed
+        return NO;
+    }
+}
+
+-(void) quit {
+    EmulationSession::GetInstance().ShutdownEmulation();
+}
+
+-(void) configureLayer:(CAMetalLayer *)layer withSize:(CGSize)size {
+    _layer = layer;
+    _size = size;
+    EmulationSession::GetInstance().SetNativeWindow((__bridge CA::MetalLayer*)layer, size);
+}
+
+-(void) bootOS {
+    EmulationSession::GetInstance().BootOS();
+}
+
+-(void) insertGame:(NSURL *)url {
+    EmulationSession::GetInstance().InitializeEmulation([url.path UTF8String], [_gameInformation informationForGame:url].programID, true);
+}
+
+-(void) insertGames:(NSArray<NSURL *> *)games {
+    for (NSURL *url in games) {
+        EmulationSession::GetInstance().ConfigureFilesystemProvider([url.path UTF8String]);
+    }
+}
+
+-(void) step {
+    void(EmulationSession::GetInstance().System().Run());
+}
+
+-(void) touchBeganAtPoint:(CGPoint)point index:(NSUInteger)index {
+    float h_ratio, w_ratio;
+    h_ratio = EmulationSession::GetInstance().Window().GetFramebufferLayout().height / (_size.height * [[UIScreen mainScreen] nativeScale]);
+    w_ratio = EmulationSession::GetInstance().Window().GetFramebufferLayout().width / (_size.width * [[UIScreen mainScreen] nativeScale]);
+
+    EmulationSession::GetInstance().Window().OnTouchPressed([[NSNumber numberWithUnsignedInteger:index] intValue],
+                                                            (point.x) * [[UIScreen mainScreen] nativeScale] * w_ratio,
+                                                            ((point.y) * [[UIScreen mainScreen] nativeScale] * h_ratio));
+}
+
+-(void) touchEndedForIndex:(NSUInteger)index {
+    EmulationSession::GetInstance().Window().OnTouchReleased([[NSNumber numberWithUnsignedInteger:index] intValue]);
+}
+
+-(void) touchMovedAtPoint:(CGPoint)point index:(NSUInteger)index {
+    float h_ratio, w_ratio;
+    h_ratio = EmulationSession::GetInstance().Window().GetFramebufferLayout().height / (_size.height * [[UIScreen mainScreen] nativeScale]);
+    w_ratio = EmulationSession::GetInstance().Window().GetFramebufferLayout().width / (_size.width * [[UIScreen mainScreen] nativeScale]);
+
+    EmulationSession::GetInstance().Window().OnTouchMoved([[NSNumber numberWithUnsignedInteger:index] intValue],
+                                                          (point.x) * [[UIScreen mainScreen] nativeScale] * w_ratio,
+                                                          ((point.y) * [[UIScreen mainScreen] nativeScale] * h_ratio));
+}
+
+-(void) thumbstickMoved:(VirtualControllerAnalogType)analog
+                      x:(CGFloat)x
+                      y:(CGFloat)y
+           controllerId:(int)controllerId {
+    EmulationSession::GetInstance().OnGamepadConnectEvent(controllerId);
+    EmulationSession::GetInstance().Window().OnGamepadJoystickEvent(controllerId, [[NSNumber numberWithUnsignedInteger:analog] intValue], CGFloat(x), CGFloat(y));
+}
+
+-(void) virtualControllerButtonDown:(VirtualControllerButtonType)button
+                       controllerId:(int)controllerId {
+    EmulationSession::GetInstance().OnGamepadConnectEvent(controllerId);
+    EmulationSession::GetInstance().Window().OnGamepadButtonEvent(controllerId, [[NSNumber numberWithUnsignedInteger:button] intValue], true);
+}
+
+-(void) virtualControllerGyro:(int)controllerId
+            deltaTimestamp:(int)delta_timestamp
+                    gyroX:(float)gyro_x
+                    gyroY:(float)gyro_y
+                    gyroZ:(float)gyro_z
+                  accelX:(float)accel_x
+                  accelY:(float)accel_y
+                  accelZ:(float)accel_z
+{
+    EmulationSession::GetInstance().OnGamepadConnectEvent(controllerId);
+    EmulationSession::GetInstance().Window().OnGamepadMotionEvent(controllerId, delta_timestamp, gyro_x, gyro_y, gyro_z, accel_x, accel_y, accel_z);
+}
+
+
+-(void) virtualControllerButtonUp:(VirtualControllerButtonType)button
+                     controllerId:(int)controllerId {
+    EmulationSession::GetInstance().OnGamepadConnectEvent(controllerId);
+    EmulationSession::GetInstance().Window().OnGamepadButtonEvent(controllerId, [[NSNumber numberWithUnsignedInteger:button] intValue], false);
+}
+
+
+-(void) orientationChanged:(UIInterfaceOrientation)orientation with:(CAMetalLayer *)layer size:(CGSize)size {
+    _layer = layer;
+    _size = size;
+    EmulationSession::GetInstance().Window().OnSurfaceChanged((__bridge CA::MetalLayer*)layer, size);
+}
+
+-(void) settingsChanged {
+    Config{"config", Config::ConfigType::GlobalConfig};
+}
+
+
+
+@end

src/ios/CMakeLists.txt

@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+enable_language(Swift OBJCXX)
+
+add_executable(eden-ios
+    AppUI-Bridging-Header.h
+    AppUI.swift
+    AppUIGameInformation.h
+    AppUIGameInformation.mm
+    AppUIObjC.h
+    AppUIObjC.mm
+    Config.h
+    Config.mm
+    EmulationSession.h
+    EmulationSession.mm
+    EmulationWindow.h
+    EmulationWindow.mm
+)
+
+target_link_libraries(eden-ios PRIVATE common core input_common frontend_common video_core glad)
+target_link_libraries(eden-ios PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
+target_link_libraries(eden-ios PRIVATE SDL2::SDL2)
+create_target_directory_groups(eden-ios)
+target_compile_options(eden-ios PRIVATE
+    -Wno-conversion
+    -Wno-unused-variable
+    -Wno-unused-parameter
+    -Wno-missing-field-initializers)

src/ios/Config.h

@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <common/settings_common.h>
+#include "common/common_types.h"
+#include "common/settings_setting.h"
+#include "common/settings_enums.h"
+
+namespace IOSSettings {
+    struct Values {
+        Settings::Linkage linkage;
+        Settings::Setting<bool> touchscreen{linkage, true, "touchscreen", Settings::Category::Overlay};
+    };
+
+    extern Values values;
+
+} // namespace IOSSettings

src/ios/Config.mm

@@ -0,0 +1,11 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+
+#include "Config.h"
+
+namespace IOSSettings {
+
+Values values;
+
+} // namespace IOSSettings

src/ios/EmulationSession.h

@@ -0,0 +1,101 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  EmulationSession.h - Sudachi
+//  Created by Jarrod Norwell on 1/20/24.
+//
+
+#pragma once
+
+#import <QuartzCore/CAMetalLayer.h>
+
+#import <Metal/Metal.hpp>
+#import "EmulationWindow/EmulationWindow.h"
+
+#include "common/detached_tasks.h"
+#include "core/core.h"
+#include "core/file_sys/registered_cache.h"
+#include "core/hle/service/acc/profile_manager.h"
+#include "core/perf_stats.h"
+#include "frontend_common/content_manager.h"
+#include "video_core/rasterizer_interface.h"
+
+class EmulationSession final {
+public:
+    explicit EmulationSession();
+    ~EmulationSession() = default;
+
+    static EmulationSession& GetInstance();
+    const Core::System& System() const;
+    Core::System& System();
+    FileSys::ManualContentProvider* GetContentProvider();
+    InputCommon::InputSubsystem& GetInputSubsystem();
+
+    const EmulationWindow& Window() const;
+    EmulationWindow& Window();
+    CA::MetalLayer* NativeWindow() const;
+    void SetNativeWindow(CA::MetalLayer* native_window, CGSize size);
+    void SurfaceChanged();
+
+    void InitializeGpuDriver();
+
+    bool IsRunning() const;
+    bool IsPaused() const;
+    void PauseEmulation();
+    void UnPauseEmulation();
+    void HaltEmulation();
+    void RunEmulation();
+    void ShutdownEmulation();
+
+    const Core::PerfStatsResults& PerfStats();
+    void ConfigureFilesystemProvider(const std::string& filepath);
+    void InitializeSystem(bool reload);
+    void SetAppletId(int applet_id);
+    Core::SystemResultStatus InitializeEmulation(const std::string& filepath,
+                                                 const std::size_t program_index,
+                                                 const bool frontend_initiated);
+    Core::SystemResultStatus BootOS();
+
+    static void OnEmulationStarted();
+    static u64 GetProgramId(std::string programId);
+    bool IsInitialized() { return is_initialized; };
+
+    bool IsHandheldOnly();
+    void SetDeviceType([[maybe_unused]] int index, int type);
+    void OnGamepadConnectEvent([[maybe_unused]] int index);
+    void OnGamepadDisconnectEvent([[maybe_unused]] int index);
+private:
+    static void LoadDiskCacheProgress(VideoCore::LoadCallbackStage stage, int progress, int max);
+    static void OnEmulationStopped(Core::SystemResultStatus result);
+    static void ChangeProgram(std::size_t program_index);
+
+private:
+    // Window management
+    std::unique_ptr<EmulationWindow> m_window;
+    CA::MetalLayer* m_native_window{};
+
+    // Core emulation
+    Core::System m_system;
+    InputCommon::InputSubsystem m_input_subsystem;
+    Common::DetachedTasks m_detached_tasks;
+    Core::PerfStatsResults m_perf_stats{};
+    std::shared_ptr<FileSys::VfsFilesystem> m_vfs;
+    Core::SystemResultStatus m_load_result{Core::SystemResultStatus::ErrorNotInitialized};
+    std::atomic<bool> m_is_running = false;
+    std::atomic<bool> m_is_paused = false;
+    std::unique_ptr<FileSys::ManualContentProvider> m_manual_provider;
+    int m_applet_id{1};
+
+    // GPU driver parameters
+    std::shared_ptr<Common::DynamicLibrary> m_vulkan_library;
+
+    // Synchronization
+    std::condition_variable_any m_cv;
+    mutable std::mutex m_mutex;
+    bool is_initialized = false;
+    CGSize m_size;
+
+    // Program index for next boot
+    std::atomic<s32> m_next_program_index = -1;
+};

src/ios/EmulationSession.mm

@@ -0,0 +1,531 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  EmulationSession.m - Sudachi
+//  Created by Jarrod Norwell on 1/20/24.
+//
+
+#import "EmulationSession.h"
+
+#include <SDL.h>
+
+#include <codecvt>
+#include <locale>
+#include <string>
+#include <string_view>
+#include <dlfcn.h>
+
+#include "common/fs/fs.h"
+#include "core/file_sys/patch_manager.h"
+#include "core/file_sys/savedata_factory.h"
+#include "core/loader/nro.h"
+#include "frontend_common/content_manager.h"
+
+#include "common/detached_tasks.h"
+#include "common/dynamic_library.h"
+#include "common/fs/path_util.h"
+#include "common/logging/backend.h"
+#include "common/logging/log.h"
+#include "common/microprofile.h"
+#include "common/scm_rev.h"
+#include "common/scope_exit.h"
+#include "common/settings.h"
+#include "common/string_util.h"
+#include "core/core.h"
+#include "core/cpu_manager.h"
+#include "core/crypto/key_manager.h"
+#include "core/file_sys/card_image.h"
+#include "core/file_sys/content_archive.h"
+#include "core/file_sys/fs_filesystem.h"
+#include "core/file_sys/submission_package.h"
+#include "core/file_sys/vfs/vfs.h"
+#include "core/file_sys/vfs/vfs_real.h"
+#include "core/frontend/applets/cabinet.h"
+#include "core/frontend/applets/controller.h"
+#include "core/frontend/applets/error.h"
+#include "core/frontend/applets/general.h"
+#include "core/frontend/applets/mii_edit.h"
+#include "core/frontend/applets/profile_select.h"
+#include "core/frontend/applets/software_keyboard.h"
+#include "core/frontend/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"
+#include "core/loader/loader.h"
+#include "frontend_common/yuzu_config.h"
+#include "hid_core/frontend/emulated_controller.h"
+#include "hid_core/hid_core.h"
+#include "hid_core/hid_types.h"
+#include "video_core/renderer_base.h"
+#include "video_core/renderer_vulkan/renderer_vulkan.h"
+#include "video_core/vulkan_common/vulkan_instance.h"
+#include "video_core/vulkan_common/vulkan_surface.h"
+
+#define jconst [[maybe_unused]] const auto
+#define jauto [[maybe_unused]] auto
+
+static EmulationSession s_instance;
+
+EmulationSession::EmulationSession() {
+    m_vfs = std::make_shared<FileSys::RealVfsFilesystem>();
+}
+
+EmulationSession& EmulationSession::GetInstance() {
+    return s_instance;
+}
+
+const Core::System& EmulationSession::System() const {
+    return m_system;
+}
+
+Core::System& EmulationSession::System() {
+    return m_system;
+}
+
+FileSys::ManualContentProvider* EmulationSession::GetContentProvider() {
+    return m_manual_provider.get();
+}
+
+InputCommon::InputSubsystem& EmulationSession::GetInputSubsystem() {
+    return m_input_subsystem;
+}
+
+const EmulationWindow& EmulationSession::Window() const {
+    return *m_window;
+}
+
+EmulationWindow& EmulationSession::Window() {
+    return *m_window;
+}
+
+CA::MetalLayer* EmulationSession::NativeWindow() const {
+    return m_native_window;
+}
+
+void EmulationSession::SetNativeWindow(CA::MetalLayer* native_window, CGSize size) {
+    m_native_window = native_window;
+    m_size = size;
+}
+
+void EmulationSession::InitializeGpuDriver() {
+    m_vulkan_library = std::make_shared<Common::DynamicLibrary>(dlopen("@executable_path/Frameworks/MoltenVK", RTLD_NOW));
+}
+
+bool EmulationSession::IsRunning() const {
+    return m_is_running;
+}
+
+bool EmulationSession::IsPaused() const {
+    return m_is_running && m_is_paused;
+}
+
+const Core::PerfStatsResults& EmulationSession::PerfStats() {
+    m_perf_stats = m_system.GetAndResetPerfStats();
+    return m_perf_stats;
+}
+
+void EmulationSession::SurfaceChanged() {
+    if (!IsRunning()) {
+        return;
+    }
+    m_window->OnSurfaceChanged(m_native_window, m_size);
+}
+
+void EmulationSession::ConfigureFilesystemProvider(const std::string& filepath) {
+    const auto file = m_system.GetFilesystem()->OpenFile(filepath, FileSys::OpenMode::Read);
+    if (!file) {
+        return;
+    }
+
+    auto loader = Loader::GetLoader(m_system, file);
+    if (!loader) {
+        return;
+    }
+
+    const auto file_type = loader->GetFileType();
+    if (file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error) {
+        return;
+    }
+
+    u64 program_id = 0;
+    const auto res2 = loader->ReadProgramId(program_id);
+    if (res2 == Loader::ResultStatus::Success && file_type == Loader::FileType::NCA) {
+        m_manual_provider->AddEntry(FileSys::TitleType::Application,
+                                    FileSys::GetCRTypeFromNCAType(FileSys::NCA{file}.GetType()),
+                                    program_id, file);
+    } else if (res2 == Loader::ResultStatus::Success &&
+               (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP)) {
+        const auto nsp = file_type == Loader::FileType::NSP
+                             ? std::make_shared<FileSys::NSP>(file)
+                             : FileSys::XCI{file}.GetSecurePartitionNSP();
+        for (const auto& title : nsp->GetNCAs()) {
+            for (const auto& entry : title.second) {
+                m_manual_provider->AddEntry(entry.first.first, entry.first.second, title.first,
+                                            entry.second->GetBaseFile());
+            }
+        }
+    }
+}
+
+void EmulationSession::InitializeSystem(bool reload) {
+    if (!reload) {
+        SDL_SetMainReady();
+
+        // Initialize logging system
+        Common::Log::Initialize();
+        Common::Log::SetColorConsoleBackendEnabled(true);
+        Common::Log::Start();
+    }
+
+    // Initialize filesystem.
+    m_system.SetFilesystem(m_vfs);
+    m_system.GetUserChannel().clear();
+    m_manual_provider = std::make_unique<FileSys::ManualContentProvider>();
+    m_system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
+    m_system.RegisterContentProvider(FileSys::ContentProviderUnionSlot::FrontendManual,
+                                     m_manual_provider.get());
+    m_system.GetFileSystemController().CreateFactories(*m_vfs);
+
+    is_initialized = true;
+}
+
+void EmulationSession::SetAppletId(int applet_id) {
+    m_applet_id = applet_id;
+    m_system.GetFrontendAppletHolder().SetCurrentAppletId(
+        static_cast<Service::AM::AppletId>(m_applet_id));
+}
+
+Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string& filepath,
+                                                               const std::size_t program_index,
+                                                               const bool frontend_initiated) {
+    std::scoped_lock lock(m_mutex);
+
+    // Create the render window.
+    m_window = std::make_unique<EmulationWindow>(&m_input_subsystem, m_native_window, m_size, m_vulkan_library);
+
+    // Initialize system.
+    m_system.SetShuttingDown(false);
+    m_system.ApplySettings();
+    Settings::LogSettings();
+    m_system.HIDCore().ReloadInputDevices();
+    m_system.SetFrontendAppletSet({
+        nullptr,                     // Amiibo Settings
+        nullptr,                     // Controller Selector
+        nullptr,                     // Error Display
+        nullptr,                     // Mii Editor
+        nullptr,                     // Parental Controls
+        nullptr,                     // Photo Viewer
+        nullptr,                     // Profile Selector
+        nullptr, // std::move(android_keyboard), // Software Keyboard
+        nullptr,                     // Web Browser
+    });
+
+    // Initialize filesystem.
+    ConfigureFilesystemProvider(filepath);
+
+    // Load the ROM.
+    Service::AM::FrontendAppletParameters params{
+        .applet_id = static_cast<Service::AM::AppletId>(m_applet_id),
+        .launch_type = frontend_initiated ? Service::AM::LaunchType::FrontendInitiated
+                                          : Service::AM::LaunchType::ApplicationInitiated,
+        .program_index = static_cast<s32>(program_index),
+    };
+    m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filepath, params);
+    if (m_load_result != Core::SystemResultStatus::Success) {
+        return m_load_result;
+    }
+
+    // Complete initialization.
+    m_system.GPU().Start();
+    m_system.GetCpuManager().OnGpuReady();
+    m_system.RegisterExitCallback([&] { HaltEmulation(); });
+
+    if (Settings::values.use_disk_shader_cache.GetValue()) {
+        m_system.Renderer().ReadRasterizer()->LoadDiskResources(
+                                                              m_system.GetApplicationProcessProgramID(), std::stop_token{},
+                                                              [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
+    }
+
+    // Register an ExecuteProgram callback such that Core can execute a sub-program
+    m_system.RegisterExecuteProgramCallback([&](std::size_t program_index_) {
+        m_next_program_index = program_index_;
+        EmulationSession::GetInstance().HaltEmulation();
+        ChangeProgram(m_next_program_index);
+    });
+
+    OnEmulationStarted();
+    return Core::SystemResultStatus::Success;
+}
+
+
+Core::SystemResultStatus EmulationSession::BootOS() {
+    std::scoped_lock lock(m_mutex);
+
+    // Create the render window.
+    m_window = std::make_unique<EmulationWindow>(&m_input_subsystem, m_native_window, m_size, m_vulkan_library);
+
+    // Initialize system.
+    m_system.SetShuttingDown(false);
+    m_system.ApplySettings();
+    Settings::LogSettings();
+    m_system.HIDCore().ReloadInputDevices();
+    m_system.SetFrontendAppletSet({
+        nullptr,                     // Amiibo Settings
+        nullptr,                     // Controller Selector
+        nullptr,                     // Error Display
+        nullptr,                     // Mii Editor
+        nullptr,                     // Parental Controls
+        nullptr,                     // Photo Viewer
+        nullptr,                     // Profile Selector
+        nullptr, // std::move(android_keyboard), // Software Keyboard
+        nullptr,                     // Web Browser
+    });
+
+    constexpr u64 QLaunchId = static_cast<u64>(Service::AM::AppletProgramId::QLaunch);
+    auto bis_system = m_system.GetFileSystemController().GetSystemNANDContents();
+
+    auto qlaunch_applet_nca = bis_system->GetEntry(QLaunchId, FileSys::ContentRecordType::Program);
+
+    m_system.GetFrontendAppletHolder().SetCurrentAppletId(Service::AM::AppletId::QLaunch);
+
+    const auto filename = qlaunch_applet_nca->GetFullPath();
+
+    auto params = Service::AM::FrontendAppletParameters {
+        .program_id = QLaunchId,
+        .applet_id = Service::AM::AppletId::QLaunch,
+        .applet_type = Service::AM::AppletType::LibraryApplet
+    };
+
+    m_load_result = m_system.Load(EmulationSession::GetInstance().Window(), filename, params);
+
+    if (m_load_result != Core::SystemResultStatus::Success) {
+        return m_load_result;
+    }
+
+    // Complete initialization.
+    m_system.GPU().Start();
+    m_system.GetCpuManager().OnGpuReady();
+    m_system.RegisterExitCallback([&] { HaltEmulation(); });
+
+    if (Settings::values.use_disk_shader_cache.GetValue()) {
+        m_system.Renderer().ReadRasterizer()->LoadDiskResources(
+                                                              m_system.GetApplicationProcessProgramID(), std::stop_token{},
+                                                              [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
+    }
+
+    // Register an ExecuteProgram callback such that Core can execute a sub-program
+    m_system.RegisterExecuteProgramCallback([&](std::size_t program_index_) {
+        m_next_program_index = program_index_;
+        EmulationSession::GetInstance().HaltEmulation();
+    });
+
+    OnEmulationStarted();
+    return Core::SystemResultStatus::Success;
+}
+
+void EmulationSession::ShutdownEmulation() {
+    std::scoped_lock lock(m_mutex);
+
+    if (m_next_program_index != -1) {
+        ChangeProgram(m_next_program_index);
+        m_next_program_index = -1;
+    }
+
+    m_is_running = false;
+
+    // Unload user input.
+    m_system.HIDCore().UnloadInputDevices();
+
+    // Enable all controllers
+    m_system.HIDCore().SetSupportedStyleTag({Core::HID::NpadStyleSet::All});
+
+    // Shutdown the main emulated process
+    if (m_load_result == Core::SystemResultStatus::Success) {
+        m_system.DetachDebugger();
+        m_system.ShutdownMainProcess();
+        m_detached_tasks.WaitForAllTasks();
+        m_load_result = Core::SystemResultStatus::ErrorNotInitialized;
+        m_window.reset();
+        OnEmulationStopped(Core::SystemResultStatus::Success);
+        return;
+    }
+
+    // Tear down the render window.
+    m_window.reset();
+}
+
+void EmulationSession::PauseEmulation() {
+    std::scoped_lock lock(m_mutex);
+    m_system.Pause();
+    m_is_paused = true;
+}
+
+void EmulationSession::UnPauseEmulation() {
+    std::scoped_lock lock(m_mutex);
+    m_system.Run();
+    m_is_paused = false;
+}
+
+void EmulationSession::HaltEmulation() {
+    std::scoped_lock lock(m_mutex);
+    m_is_running = false;
+    m_cv.notify_one();
+}
+
+void EmulationSession::RunEmulation() {
+    {
+        std::scoped_lock lock(m_mutex);
+        m_is_running = true;
+    }
+
+    // Load the disk shader cache.
+    if (Settings::values.use_disk_shader_cache.GetValue()) {
+        LoadDiskCacheProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
+        m_system.Renderer().ReadRasterizer()->LoadDiskResources(
+            m_system.GetApplicationProcessProgramID(), std::stop_token{}, LoadDiskCacheProgress);
+        LoadDiskCacheProgress(VideoCore::LoadCallbackStage::Complete, 0, 0);
+    }
+
+    void(m_system.Run());
+
+    if (m_system.DebuggerEnabled()) {
+        m_system.InitializeDebugger();
+    }
+
+    while (true) {
+        {
+            [[maybe_unused]] std::unique_lock lock(m_mutex);
+            if (m_cv.wait_for(lock, std::chrono::milliseconds(800),
+                              [&]() { return !m_is_running; })) {
+                // Emulation halted.
+                break;
+            }
+        }
+    }
+
+    // Reset current applet ID.
+    m_applet_id = static_cast<int>(Service::AM::AppletId::Application);
+}
+
+void EmulationSession::LoadDiskCacheProgress(VideoCore::LoadCallbackStage stage, int progress,
+                                             int max) {
+
+}
+
+void EmulationSession::OnEmulationStarted() {
+
+}
+
+void EmulationSession::OnEmulationStopped(Core::SystemResultStatus result) {
+
+}
+
+void EmulationSession::ChangeProgram(std::size_t program_index) {
+    LOG_INFO(Frontend, "Trying To Switch Program");
+    // Halt current emulation session
+    EmulationSession::GetInstance().HaltEmulation();
+    // Save the current state if necessary
+
+    // Shutdown the current emulation session cleanly
+        // Update the program index
+    EmulationSession::GetInstance().m_next_program_index = program_index;
+
+    // Initialize the new program
+    // Start the new emulation session
+    EmulationSession::GetInstance().RunEmulation();
+}
+
+u64 EmulationSession::GetProgramId(std::string programId) {
+    try {
+        return std::stoull(programId);
+    } catch (...) {
+        return 0;
+    }
+}
+
+static Core::SystemResultStatus RunEmulation(const std::string& filepath,
+                                             const size_t program_index,
+                                             const bool frontend_initiated) {
+    MicroProfileOnThreadCreate("EmuThread");
+    SCOPE_EXIT {
+        MicroProfileShutdown();
+    };
+
+    LOG_INFO(Frontend, "starting");
+
+    if (filepath.empty()) {
+        LOG_CRITICAL(Frontend, "failed to load: filepath empty!");
+        return Core::SystemResultStatus::ErrorLoader;
+    }
+
+    SCOPE_EXIT {
+        EmulationSession::GetInstance().ShutdownEmulation();
+    };
+
+    jconst result = EmulationSession::GetInstance().InitializeEmulation(filepath, program_index,
+                                                                        frontend_initiated);
+    if (result != Core::SystemResultStatus::Success) {
+        return result;
+    }
+
+    EmulationSession::GetInstance().RunEmulation();
+
+    return Core::SystemResultStatus::Success;
+}
+
+
+
+bool EmulationSession::IsHandheldOnly() {
+    jconst npad_style_set = m_system.HIDCore().GetSupportedStyleTag();
+
+    if (npad_style_set.fullkey == 1) {
+        return false;
+    }
+
+    if (npad_style_set.handheld == 0) {
+        return false;
+    }
+
+    return !Settings::IsDockedMode();
+}
+
+void EmulationSession::SetDeviceType([[maybe_unused]] int index, int type) {
+    jauto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
+    controller->SetNpadStyleIndex(static_cast<Core::HID::NpadStyleIndex>(type));
+}
+
+void EmulationSession::OnGamepadConnectEvent([[maybe_unused]] int index) {
+    jauto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
+
+    // Ensure that player1 is configured correctly and handheld disconnected
+    if (controller->GetNpadIdType() == Core::HID::NpadIdType::Player1) {
+        jauto handheld = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
+
+        if (controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) {
+            handheld->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey);
+            controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Fullkey);
+            handheld->Disconnect();
+        }
+    }
+
+    // Ensure that handheld is configured correctly and player 1 disconnected
+    if (controller->GetNpadIdType() == Core::HID::NpadIdType::Handheld) {
+        jauto player1 = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
+
+        if (controller->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::Handheld) {
+            player1->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);
+            controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);
+            player1->Disconnect();
+        }
+    }
+
+    if (!controller->IsConnected()) {
+        controller->Connect();
+    }
+}
+
+void EmulationSession::OnGamepadDisconnectEvent([[maybe_unused]] int index) {
+    jauto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
+    controller->Disconnect();
+}

src/ios/EmulationWindow.h

@@ -0,0 +1,83 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  EmulationWindow.h - Sudachi
+//  Created by Jarrod Norwell on 1/18/24.
+//
+
+#pragma once
+
+#import <Metal/Metal.hpp>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#include <memory>
+#include <span>
+
+#include "core/frontend/emu_window.h"
+#include "core/frontend/graphics_context.h"
+#include "input_common/main.h"
+
+class GraphicsContext_Apple final : public Core::Frontend::GraphicsContext {
+public:
+    explicit GraphicsContext_Apple(std::shared_ptr<Common::DynamicLibrary> driver_library)
+        : m_driver_library{driver_library} {}
+
+    ~GraphicsContext_Apple() = default;
+
+    std::shared_ptr<Common::DynamicLibrary> GetDriverLibrary() override {
+        return m_driver_library;
+    }
+
+private:
+    std::shared_ptr<Common::DynamicLibrary> m_driver_library;
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+class EmulationWindow final : public Core::Frontend::EmuWindow {
+public:
+    EmulationWindow(InputCommon::InputSubsystem* input_subsystem, CA::MetalLayer* surface, CGSize size,
+                      std::shared_ptr<Common::DynamicLibrary> driver_library);
+
+    ~EmulationWindow() = default;
+
+    void OnSurfaceChanged(CA::MetalLayer* surface, CGSize size);
+    void OrientationChanged(UIInterfaceOrientation orientation);
+    void OnFrameDisplayed() override;
+
+    void OnTouchPressed(int id, float x, float y);
+    void OnTouchMoved(int id, float x, float y);
+    void OnTouchReleased(int id);
+
+    void OnGamepadButtonEvent(int player_index, int button_id, bool pressed);
+    void OnGamepadJoystickEvent(int player_index, int stick_id, float x, float y);
+    void OnGamepadMotionEvent(int player_index, u64 delta_timestamp, float gyro_x, float gyro_y, float gyro_z, float accel_x, float accel_y, float accel_z);
+
+    std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override {
+        return {std::make_unique<GraphicsContext_Apple>(m_driver_library)};
+    }
+
+
+    bool HasFirstFrame() const {
+        return m_first_frame;
+    }
+
+    bool IsShown() const override {
+        return true;
+    };
+
+private:
+    float m_window_width{};
+    float m_window_height{};
+    CGSize m_size;
+    bool is_portrait = true;
+
+    InputCommon::InputSubsystem* m_input_subsystem{};
+    std::shared_ptr<Common::DynamicLibrary> m_driver_library;
+
+    bool m_first_frame = false;
+};
+
+NS_ASSUME_NONNULL_END

src/ios/EmulationWindow.mm

@@ -0,0 +1,84 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+//
+//  EmulationWindow.mm - Sudachi
+//  Created by Jarrod Norwell on 1/18/24.
+//
+
+#import "EmulationWindow.h"
+#import "EmulationSession/EmulationSession.h"
+
+#include <SDL.h>
+
+#include "common/logging/log.h"
+#include "input_common/drivers/touch_screen.h"
+#include "input_common/drivers/virtual_amiibo.h"
+#include "input_common/drivers/virtual_gamepad.h"
+#include "input_common/main.h"
+
+void EmulationWindow::OnSurfaceChanged(CA::MetalLayer* surface, CGSize size) {
+    m_size = size;
+
+    m_window_width = size.width;
+    m_window_height = size.height;
+
+    // Ensures that we emulate with the correct aspect ratio.
+    // UpdateCurrentFramebufferLayout(m_window_width, m_window_height);
+
+    window_info.render_surface = reinterpret_cast<void*>(surface);
+    window_info.render_surface_scale = [[UIScreen mainScreen] nativeScale];
+}
+
+void EmulationWindow::OrientationChanged(UIInterfaceOrientation orientation) {
+    is_portrait = orientation == UIInterfaceOrientationPortrait;
+}
+
+void EmulationWindow::OnTouchPressed(int id, float x, float y) {
+    const auto [touch_x, touch_y] = MapToTouchScreen(x, y);
+    EmulationSession::GetInstance().GetInputSubsystem().GetTouchScreen()->TouchPressed(touch_x,
+                                                                                       touch_y, id);
+}
+
+void EmulationWindow::OnTouchMoved(int id, float x, float y) {
+    const auto [touch_x, touch_y] = MapToTouchScreen(x, y);
+    EmulationSession::GetInstance().GetInputSubsystem().GetTouchScreen()->TouchMoved(touch_x,
+                                                                                     touch_y, id);
+}
+
+void EmulationWindow::OnTouchReleased(int id) {
+    EmulationSession::GetInstance().GetInputSubsystem().GetTouchScreen()->TouchReleased(id);
+}
+
+void EmulationWindow::OnGamepadButtonEvent(int player_index, int button_id, bool pressed) {
+    m_input_subsystem->GetVirtualGamepad()->SetButtonState(player_index, button_id, pressed);
+}
+
+void EmulationWindow::OnGamepadJoystickEvent(int player_index, int stick_id, float x, float y) {
+    m_input_subsystem->GetVirtualGamepad()->SetStickPosition(player_index, stick_id, x, y);
+}
+
+void EmulationWindow::OnGamepadMotionEvent(int player_index, u64 delta_timestamp, float gyro_x, float gyro_y, float gyro_z, float accel_x, float accel_y, float accel_z) {
+    m_input_subsystem->GetVirtualGamepad()->SetMotionState(player_index, delta_timestamp, gyro_x, gyro_y, gyro_z, accel_x, accel_y, accel_z);
+}
+
+void EmulationWindow::OnFrameDisplayed() {
+    if (!m_first_frame) {
+        m_first_frame = true;
+    }
+}
+
+EmulationWindow::EmulationWindow(InputCommon::InputSubsystem* input_subsystem, CA::MetalLayer* surface, CGSize size, std::shared_ptr<Common::DynamicLibrary> driver_library) : m_input_subsystem{input_subsystem}, m_size{size}, m_driver_library{driver_library} {
+    LOG_INFO(Frontend, "initializing");
+
+    if (!surface) {
+        LOG_CRITICAL(Frontend, "surface is nullptr");
+        return;
+    }
+
+    OnSurfaceChanged(surface, m_size);
+    window_info.render_surface_scale = [[UIScreen mainScreen] nativeScale];
+    window_info.type = Core::Frontend::WindowSystemType::Cocoa;
+
+    m_input_subsystem->Initialize();
+}

src/qt_common/config/shared_translation.cpp

@@ -425,6 +425,9 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
               "their resolution, details and supported controllers and depending on this setting.\n"
               "Setting to Handheld can help improve performance for low end systems."));
     INSERT(Settings, current_user, QString(), QString());
+    INSERT(Settings, serial_unit, tr("Unit Serial"), QString());
+    INSERT(Settings, serial_battery, tr("Battery Serial"), QString());
+    INSERT(Settings, debug_knobs, tr("Debug knobs"), QString());
 
     // Controls
 

src/shader_recompiler/backend/spirv/emit_spirv_special.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -91,6 +94,17 @@ void AlphaTest(EmitContext& ctx) {
 } // Anonymous namespace
 
 void EmitPrologue(EmitContext& ctx) {
+    if (ctx.stage == Stage::Fragment && ctx.runtime_info.dual_source_blend) {
+        // Initialize dual-source blending outputs - prevents MoltenVK crash.
+        const Id zero{ctx.Const(0.0f)};
+        const Id one{ctx.Const(1.0f)};
+        const Id default_color{ctx.ConstantComposite(ctx.F32[4], zero, zero, zero, one)};
+        for (u32 i = 0; i < 2; ++i) {
+            if (Sirit::ValidId(ctx.frag_color[i])) {
+                ctx.OpStore(ctx.frag_color[i], default_color);
+            }
+        }
+    }
     if (ctx.stage == Stage::VertexB) {
         const Id zero{ctx.Const(0.0f)};
         const Id one{ctx.Const(1.0f)};

src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@@ -1670,13 +1670,22 @@ void EmitContext::DefineOutputs(const IR::Program& program) {
         break;
     case Stage::Fragment:
         for (u32 index = 0; index < 8; ++index) {
-            if (!info.stores_frag_color[index] && !profile.need_declared_frag_colors) {
+            const bool need_dual_source = runtime_info.dual_source_blend && index <= 1;
+            if (!need_dual_source && !info.stores_frag_color[index] &&
+                !profile.need_declared_frag_colors) {
                 continue;
             }
             const Id type{GetAttributeType(*this, runtime_info.color_output_types[index])};
             frag_color[index] = DefineOutput(*this, type, std::nullopt);
-            Decorate(frag_color[index], spv::Decoration::Location, index);
-            Name(frag_color[index], fmt::format("frag_color{}", index));
+            // Correct mapping for dual-source blending
+            if (runtime_info.dual_source_blend && index <= 1) {
+                Decorate(frag_color[index], spv::Decoration::Location, 0u);
+                Decorate(frag_color[index], spv::Decoration::Index, index);
+                Name(frag_color[index], index == 0 ? "frag_color0" : "frag_color0_secondary");
+            } else {
+                Decorate(frag_color[index], spv::Decoration::Location, index);
+                Name(frag_color[index], fmt::format("frag_color{}", index));
+            }
         }
         if (info.stores_frag_depth) {
             frag_depth = DefineOutput(*this, F32[1], std::nullopt);

src/shader_recompiler/runtime_info.h

@@ -110,6 +110,9 @@ struct RuntimeInfo {
 
     /// Output types for each color attachment
     std::array<AttributeType, 8> color_output_types{};
+
+    /// Dual source blending
+    bool dual_source_blend{};
 };
 
 } // namespace Shader

src/video_core/buffer_cache/buffer_cache_base.h

@@ -14,9 +14,12 @@
 #include <mutex>
 #include <numeric>
 #include <span>
-#include <ankerl/unordered_dense.h>
 #include <vector>
 
+#include <ankerl/unordered_dense.h>
+#include <boost/container/static_vector.hpp>
+#include <boost/container/small_vector.hpp>
+
 #include "common/common_types.h"
 #include "common/div_ceil.h"
 #include "common/literals.h"
@@ -94,10 +97,10 @@ static constexpr Binding NULL_BINDING{
 
 template <typename Buffer>
 struct HostBindings {
-    boost::container::small_vector<Buffer*, NUM_VERTEX_BUFFERS> buffers;
-    boost::container::small_vector<u64, NUM_VERTEX_BUFFERS> offsets;
-    boost::container::small_vector<u64, NUM_VERTEX_BUFFERS> sizes;
-    boost::container::small_vector<u64, NUM_VERTEX_BUFFERS> strides;
+    boost::container::static_vector<Buffer*, NUM_VERTEX_BUFFERS> buffers;
+    boost::container::static_vector<u64, NUM_VERTEX_BUFFERS> offsets;
+    boost::container::static_vector<u64, NUM_VERTEX_BUFFERS> sizes;
+    boost::container::static_vector<u64, NUM_VERTEX_BUFFERS> strides;
     u32 min_index{NUM_VERTEX_BUFFERS};
     u32 max_index{0};
 };

src/video_core/control/channel_state.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -19,12 +22,12 @@ ChannelState::ChannelState(s32 bind_id_) : bind_id{bind_id_}, initialized{} {}
 void ChannelState::Init(Core::System& system, GPU& gpu, u64 program_id_) {
     ASSERT(memory_manager);
     program_id = program_id_;
-    dma_pusher = std::make_unique<Tegra::DmaPusher>(system, gpu, *memory_manager, *this);
-    maxwell_3d = std::make_unique<Engines::Maxwell3D>(system, *memory_manager);
-    fermi_2d = std::make_unique<Engines::Fermi2D>(*memory_manager);
-    kepler_compute = std::make_unique<Engines::KeplerCompute>(system, *memory_manager);
-    maxwell_dma = std::make_unique<Engines::MaxwellDMA>(system, *memory_manager);
-    kepler_memory = std::make_unique<Engines::KeplerMemory>(system, *memory_manager);
+    dma_pusher.emplace(system, gpu, *memory_manager, *this);
+    maxwell_3d.emplace(system, *memory_manager);
+    fermi_2d.emplace(*memory_manager);
+    kepler_compute.emplace(system, *memory_manager);
+    maxwell_dma.emplace(system, *memory_manager);
+    kepler_memory.emplace(system, *memory_manager);
     initialized = true;
 }
 

src/video_core/control/channel_state.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -6,6 +9,12 @@
 #include <memory>
 
 #include "common/common_types.h"
+#include "video_core/engines/fermi_2d.h"
+#include "video_core/engines/kepler_memory.h"
+#include "video_core/engines/kepler_compute.h"
+#include "video_core/engines/maxwell_3d.h"
+#include "video_core/engines/maxwell_dma.h"
+#include "video_core/dma_pusher.h"
 
 namespace Core {
 class System;
@@ -18,49 +27,34 @@ class RasterizerInterface;
 namespace Tegra {
 
 class GPU;
-
-namespace Engines {
-class Puller;
-class Fermi2D;
-class Maxwell3D;
-class MaxwellDMA;
-class KeplerCompute;
-class KeplerMemory;
-} // namespace Engines
-
 class MemoryManager;
-class DmaPusher;
 
 namespace Control {
 
 struct ChannelState {
     explicit ChannelState(s32 bind_id);
-    ChannelState(const ChannelState& state) = delete;
-    ChannelState& operator=(const ChannelState&) = delete;
-    ChannelState(ChannelState&& other) noexcept = default;
-    ChannelState& operator=(ChannelState&& other) noexcept = default;
 
     void Init(Core::System& system, GPU& gpu, u64 program_id);
 
     void BindRasterizer(VideoCore::RasterizerInterface* rasterizer);
 
-    s32 bind_id = -1;
-    u64 program_id = 0;
     /// 3D engine
-    std::unique_ptr<Engines::Maxwell3D> maxwell_3d;
+    std::optional<Engines::Maxwell3D> maxwell_3d;
     /// 2D engine
-    std::unique_ptr<Engines::Fermi2D> fermi_2d;
+    std::optional<Engines::Fermi2D> fermi_2d;
     /// Compute engine
-    std::unique_ptr<Engines::KeplerCompute> kepler_compute;
+    std::optional<Engines::KeplerCompute> kepler_compute;
     /// DMA engine
-    std::unique_ptr<Engines::MaxwellDMA> maxwell_dma;
+    std::optional<Engines::MaxwellDMA> maxwell_dma;
     /// Inline memory engine
-    std::unique_ptr<Engines::KeplerMemory> kepler_memory;
-
+    std::optional<Engines::KeplerMemory> kepler_memory;
+    /// NV01 Timer
+    std::optional<Engines::KeplerMemory> nv01_timer;
+    std::optional<DmaPusher> dma_pusher;
     std::shared_ptr<MemoryManager> memory_manager;
 
-    std::unique_ptr<DmaPusher> dma_pusher;
-
+    s32 bind_id = -1;
+    u64 program_id = 0;
     bool initialized{};
 };
 

src/video_core/engines/engine_interface.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -15,6 +15,7 @@
 namespace Tegra::Engines {
 
 enum class EngineTypes : u32 {
+    Nv01Timer,
     KeplerCompute,
     Maxwell3D,
     Fermi2D,

src/video_core/engines/maxwell_3d.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -26,8 +26,15 @@ namespace Tegra::Engines {
 constexpr u32 MacroRegistersStart = 0xE00;
 
 Maxwell3D::Maxwell3D(Core::System& system_, MemoryManager& memory_manager_)
-    : draw_manager{std::make_unique<DrawManager>(this)}, system{system_},
-      memory_manager{memory_manager_}, macro_engine{GetMacroEngine(*this)}, upload_state{memory_manager, regs.upload} {
+    : draw_manager{std::make_unique<DrawManager>(this)}, system{system_}
+    , memory_manager{memory_manager_}
+#ifdef ARCHITECTURE_x86_64
+    , macro_engine(bool(Settings::values.disable_macro_jit))
+#else
+    , macro_engine(true)
+#endif
+    , upload_state{memory_manager, regs.upload}
+{
     dirty.flags.flip();
     InitializeRegisterDefaults();
     execution_mask.reset();
@@ -328,9 +335,9 @@ void Maxwell3D::ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argume
         shadow_state.shadow_ram_control = static_cast<Regs::ShadowRamControl>(nonshadow_argument);
         return;
     case MAXWELL3D_REG_INDEX(load_mme.instruction_ptr):
-        return macro_engine->ClearCode(regs.load_mme.instruction_ptr);
+        return macro_engine.ClearCode(regs.load_mme.instruction_ptr);
     case MAXWELL3D_REG_INDEX(load_mme.instruction):
-        return macro_engine->AddCode(regs.load_mme.instruction_ptr, argument);
+        return macro_engine.AddCode(regs.load_mme.instruction_ptr, argument);
     case MAXWELL3D_REG_INDEX(load_mme.start_address):
         return ProcessMacroBind(argument);
     case MAXWELL3D_REG_INDEX(falcon[4]):
@@ -398,7 +405,7 @@ void Maxwell3D::CallMacroMethod(u32 method, const std::vector<u32>& parameters)
         ((method - MacroRegistersStart) >> 1) % static_cast<u32>(macro_positions.size());
 
     // Execute the current macro.
-    macro_engine->Execute(macro_positions[entry], parameters);
+    macro_engine.Execute(*this, macro_positions[entry], parameters);
 
     draw_manager->DrawDeferred();
 }
@@ -464,7 +471,7 @@ void Maxwell3D::CallMultiMethod(u32 method, const u32* base_start, u32 amount,
 }
 
 void Maxwell3D::ProcessMacroUpload(u32 data) {
-    macro_engine->AddCode(regs.load_mme.instruction_ptr++, data);
+    macro_engine.AddCode(regs.load_mme.instruction_ptr++, data);
 }
 
 void Maxwell3D::ProcessMacroBind(u32 data) {

src/video_core/engines/maxwell_3d.h

@@ -2258,7 +2258,7 @@ public:
             /// Returns whether the vertex array specified by index is supposed to be
             /// accessed per instance or not.
             bool IsInstancingEnabled(std::size_t index) const {
-                return is_instanced[index];
+                return bool(is_instanced[index]); //FUCK YOU MSVC
             }
         };
 
@@ -3203,7 +3203,7 @@ private:
     std::vector<u32> macro_params;
 
     /// Interpreter for the macro codes uploaded to the GPU.
-    std::optional<MacroEngine> macro_engine;
+    MacroEngine macro_engine;
 
     Upload::State upload_state;
 

src/video_core/engines/nv01_timer.h

@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <array>
+#include <cstddef>
+#include "common/bit_field.h"
+#include "common/common_funcs.h"
+#include "common/common_types.h"
+#include "common/logging/log.h"
+#include "video_core/engines/engine_interface.h"
+#include "video_core/engines/engine_upload.h"
+
+namespace Core {
+class System;
+}
+
+namespace Tegra {
+class MemoryManager;
+}
+
+namespace Tegra::Engines {
+class Nv01Timer final : public EngineInterface {
+public:
+    explicit Nv01Timer(Core::System& system_, MemoryManager& memory_manager)
+        : system{system_}
+    {}
+    ~Nv01Timer() override;
+
+    /// Write the value to the register identified by method.
+    void CallMethod(u32 method, u32 method_argument, bool is_last_call) override {
+        LOG_DEBUG(HW_GPU, "method={}, argument={}, is_last_call={}", method, method_argument, is_last_call);
+    }
+
+    /// Write multiple values to the register identified by method.
+    void CallMultiMethod(u32 method, const u32* base_start, u32 amount, u32 methods_pending) override {
+        LOG_DEBUG(HW_GPU, "method={}, base_start={}, amount={}, pending={}", method, fmt::ptr(base_start), amount, methods_pending);
+    }
+
+    struct Regs {
+        // No fucking idea
+        INSERT_PADDING_BYTES_NOINIT(0x48);
+    } regs{};
+private:
+    void ConsumeSinkImpl() override {}
+    Core::System& system;
+};
+}

src/video_core/engines/puller.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -34,24 +37,22 @@ void Puller::ProcessBindMethod(const MethodCall& method_call) {
     bound_engines[method_call.subchannel] = engine_id;
     switch (engine_id) {
     case EngineID::FERMI_TWOD_A:
-        dma_pusher.BindSubchannel(channel_state.fermi_2d.get(), method_call.subchannel,
-                                  EngineTypes::Fermi2D);
+        dma_pusher.BindSubchannel(&*channel_state.fermi_2d, method_call.subchannel, EngineTypes::Fermi2D);
         break;
     case EngineID::MAXWELL_B:
-        dma_pusher.BindSubchannel(channel_state.maxwell_3d.get(), method_call.subchannel,
-                                  EngineTypes::Maxwell3D);
+        dma_pusher.BindSubchannel(&*channel_state.maxwell_3d, method_call.subchannel, EngineTypes::Maxwell3D);
         break;
     case EngineID::KEPLER_COMPUTE_B:
-        dma_pusher.BindSubchannel(channel_state.kepler_compute.get(), method_call.subchannel,
-                                  EngineTypes::KeplerCompute);
+        dma_pusher.BindSubchannel(&*channel_state.kepler_compute, method_call.subchannel, EngineTypes::KeplerCompute);
         break;
     case EngineID::MAXWELL_DMA_COPY_A:
-        dma_pusher.BindSubchannel(channel_state.maxwell_dma.get(), method_call.subchannel,
-                                  EngineTypes::MaxwellDMA);
+        dma_pusher.BindSubchannel(&*channel_state.maxwell_dma, method_call.subchannel, EngineTypes::MaxwellDMA);
         break;
     case EngineID::KEPLER_INLINE_TO_MEMORY_B:
-        dma_pusher.BindSubchannel(channel_state.kepler_memory.get(), method_call.subchannel,
-                                  EngineTypes::KeplerMemory);
+        dma_pusher.BindSubchannel(&*channel_state.kepler_memory, method_call.subchannel, EngineTypes::KeplerMemory);
+        break;
+    case EngineID::NV01_TIMER:
+        dma_pusher.BindSubchannel(&*channel_state.nv01_timer, method_call.subchannel, EngineTypes::Nv01Timer);
         break;
     default:
         UNIMPLEMENTED_MSG("Unimplemented engine {:04X}", engine_id);
@@ -209,24 +210,22 @@ void Puller::CallEngineMethod(const MethodCall& method_call) {
 
     switch (engine) {
     case EngineID::FERMI_TWOD_A:
-        channel_state.fermi_2d->CallMethod(method_call.method, method_call.argument,
-                                           method_call.IsLastCall());
+        channel_state.fermi_2d->CallMethod(method_call.method, method_call.argument, method_call.IsLastCall());
         break;
     case EngineID::MAXWELL_B:
-        channel_state.maxwell_3d->CallMethod(method_call.method, method_call.argument,
-                                             method_call.IsLastCall());
+        channel_state.maxwell_3d->CallMethod(method_call.method, method_call.argument, method_call.IsLastCall());
         break;
     case EngineID::KEPLER_COMPUTE_B:
-        channel_state.kepler_compute->CallMethod(method_call.method, method_call.argument,
-                                                 method_call.IsLastCall());
+        channel_state.kepler_compute->CallMethod(method_call.method, method_call.argument, method_call.IsLastCall());
         break;
     case EngineID::MAXWELL_DMA_COPY_A:
-        channel_state.maxwell_dma->CallMethod(method_call.method, method_call.argument,
-                                              method_call.IsLastCall());
+        channel_state.maxwell_dma->CallMethod(method_call.method, method_call.argument, method_call.IsLastCall());
         break;
     case EngineID::KEPLER_INLINE_TO_MEMORY_B:
-        channel_state.kepler_memory->CallMethod(method_call.method, method_call.argument,
-                                                method_call.IsLastCall());
+        channel_state.kepler_memory->CallMethod(method_call.method, method_call.argument, method_call.IsLastCall());
+        break;
+    case EngineID::NV01_TIMER:
+        channel_state.nv01_timer->CallMethod(method_call.method, method_call.argument, method_call.IsLastCall());
         break;
     default:
         UNIMPLEMENTED_MSG("Unimplemented engine");
@@ -255,6 +254,9 @@ void Puller::CallEngineMultiMethod(u32 method, u32 subchannel, const u32* base_s
     case EngineID::KEPLER_INLINE_TO_MEMORY_B:
         channel_state.kepler_memory->CallMultiMethod(method, base_start, amount, methods_pending);
         break;
+    case EngineID::NV01_TIMER:
+        channel_state.nv01_timer->CallMultiMethod(method, base_start, amount, methods_pending);
+        break;
     default:
         UNIMPLEMENTED_MSG("Unimplemented engine");
         break;

src/video_core/engines/puller.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -20,6 +23,7 @@ class MemoryManager;
 class DmaPusher;
 
 enum class EngineID {
+    NV01_TIMER = 0x0004,
     FERMI_TWOD_A = 0x902D, // 2D Engine
     MAXWELL_B = 0xB197,    // 3D Engine
     KEPLER_COMPUTE_B = 0xB1C0,

src/video_core/macro.h

@@ -7,8 +7,10 @@
 #pragma once
 
 #include <memory>
-#include <ankerl/unordered_dense.h>
+#include <span>
+#include <variant>
 #include <vector>
+#include <ankerl/unordered_dense.h>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 
@@ -98,62 +100,142 @@ union MethodAddress {
 
 } // namespace Macro
 
-class CachedMacro {
-public:
-    CachedMacro(Engines::Maxwell3D& maxwell3d_)
-        : maxwell3d{maxwell3d_}
-    {}
-    virtual ~CachedMacro() = default;
+struct HLEMacro {
+};
+/// @note: these macros have two versions, a normal and extended version, with the extended version
+/// also assigning the base vertex/instance.
+struct HLE_DrawArraysIndirect final {
+    HLE_DrawArraysIndirect(bool extended_) noexcept : extended{extended_} {}
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+    void Fallback(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters);
+    bool extended;
+};
+/// @note: these macros have two versions, a normal and extended version, with the extended version
+/// also assigning the base vertex/instance.
+struct HLE_DrawIndexedIndirect final {
+    explicit HLE_DrawIndexedIndirect(bool extended_) noexcept : extended{extended_} {}
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+    void Fallback(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters);
+    bool extended;
+};
+struct HLE_MultiLayerClear final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+};
+struct HLE_MultiDrawIndexedIndirectCount final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+    void Fallback(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters);
+};
+struct HLE_DrawIndirectByteCount final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+    void Fallback(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters);
+};
+struct HLE_C713C83D8F63CCF3 final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+};
+struct HLE_D7333D26E0A93EDE final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+};
+struct HLE_BindShader final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+};
+struct HLE_SetRasterBoundingBox final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+};
+struct HLE_ClearConstBuffer final {
+    HLE_ClearConstBuffer(size_t base_size_) noexcept : base_size{base_size_} {}
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+    size_t base_size;
+};
+struct HLE_ClearMemory final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+    std::vector<u32> zero_memory;
+};
+struct HLE_TransformFeedbackSetup final {
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method);
+};
+struct MacroInterpreterImpl final {
+    MacroInterpreterImpl() {}
+    MacroInterpreterImpl(std::span<const u32> code_) : code{code_} {}
+    void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> params, u32 method);
+    void Reset();
+    bool Step(Engines::Maxwell3D& maxwell3d, bool is_delay_slot);
+    u32 GetALUResult(Macro::ALUOperation operation, u32 src_a, u32 src_b);
+    void ProcessResult(Engines::Maxwell3D& maxwell3d, Macro::ResultOperation operation, u32 reg, u32 result);
+    bool EvaluateBranchCondition(Macro::BranchCondition cond, u32 value) const;
+    Macro::Opcode GetOpcode() const;
+    u32 GetRegister(u32 register_id) const;
+    void SetRegister(u32 register_id, u32 value);
+    /// Sets the method address to use for the next Send instruction.
+    [[nodiscard]] inline void SetMethodAddress(u32 address) noexcept {
+        method_address.raw = address;
+    }
+    void Send(Engines::Maxwell3D& maxwell3d, u32 value);
+    u32 Read(Engines::Maxwell3D& maxwell3d, u32 method) const;
+    u32 FetchParameter();
+    /// General purpose macro registers.
+    std::array<u32, Macro::NUM_MACRO_REGISTERS> registers = {};
+    /// Input parameters of the current macro.
+    std::vector<u32> parameters;
+    std::span<const u32> code;
+    /// Program counter to execute at after the delay slot is executed.
+    std::optional<u32> delayed_pc;
+    /// Method address to use for the next Send instruction.
+    Macro::MethodAddress method_address = {};
+    /// Current program counter
+    u32 pc{};
+    /// Index of the next parameter that will be fetched by the 'parm' instruction.
+    u32 next_parameter_index = 0;
+    bool carry_flag = false;
+};
+struct DynamicCachedMacro {
+    virtual ~DynamicCachedMacro() = default;
     /// Executes the macro code with the specified input parameters.
     /// @param parameters The parameters of the macro
     /// @param method     The method to execute
-    virtual void Execute(const std::vector<u32>& parameters, u32 method) = 0;
-    Engines::Maxwell3D& maxwell3d;
+    virtual void Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, u32 method) = 0;
 };
 
-class HLEMacro {
-public:
-    explicit HLEMacro(Engines::Maxwell3D& maxwell3d_);
-    ~HLEMacro();
-    // Allocates and returns a cached macro if the hash matches a known function.
-    // Returns nullptr otherwise.
-    [[nodiscard]] std::unique_ptr<CachedMacro> GetHLEProgram(u64 hash) const;
-private:
-    Engines::Maxwell3D& maxwell3d;
-};
-
-class MacroEngine {
-public:
-    explicit MacroEngine(Engines::Maxwell3D& maxwell3d, bool is_interpreted);
-    ~MacroEngine();
+using AnyCachedMacro = std::variant<
+    std::monostate,
+    HLEMacro,
+    HLE_DrawArraysIndirect,
+    HLE_DrawIndexedIndirect,
+    HLE_MultiDrawIndexedIndirectCount,
+    HLE_MultiLayerClear,
+    HLE_C713C83D8F63CCF3,
+    HLE_D7333D26E0A93EDE,
+    HLE_BindShader,
+    HLE_SetRasterBoundingBox,
+    HLE_ClearConstBuffer,
+    HLE_ClearMemory,
+    HLE_TransformFeedbackSetup,
+    HLE_DrawIndirectByteCount,
+    MacroInterpreterImpl,
+    // Used for JIT x86 macro
+    std::unique_ptr<DynamicCachedMacro>
+>;
 
+struct MacroEngine {
+    MacroEngine(bool is_interpreted_) noexcept : is_interpreted{is_interpreted_} {}
     // Store the uploaded macro code to compile them when they're called.
-    void AddCode(u32 method, u32 data);
-
+    inline void AddCode(u32 method, u32 data) noexcept {
+        uploaded_macro_code[method].push_back(data);
+    }
     // Clear the code associated with a method.
-    void ClearCode(u32 method);
-
+    inline void ClearCode(u32 method) noexcept {
+        macro_cache.erase(method);
+        uploaded_macro_code.erase(method);
+    }
     // Compiles the macro if its not in the cache, and executes the compiled macro
-    void Execute(u32 method, const std::vector<u32>& parameters);
-
-protected:
-    std::unique_ptr<CachedMacro> Compile(const std::vector<u32>& code);
-
-private:
+    void Execute(Engines::Maxwell3D& maxwell3d, u32 method, std::span<const u32> parameters);
+    AnyCachedMacro Compile(Engines::Maxwell3D& maxwell3d, std::span<const u32> code);
     struct CacheInfo {
-        std::unique_ptr<CachedMacro> lle_program{};
-        std::unique_ptr<CachedMacro> hle_program{};
+        AnyCachedMacro program;
         u64 hash{};
-        bool has_hle_program{};
     };
-
     ankerl::unordered_dense::map<u32, CacheInfo> macro_cache;
     ankerl::unordered_dense::map<u32, std::vector<u32>> uploaded_macro_code;
-    std::optional<HLEMacro> hle_macros;
-    Engines::Maxwell3D& maxwell3d;
     bool is_interpreted;
 };
 
-std::optional<MacroEngine> GetMacroEngine(Engines::Maxwell3D& maxwell3d);
-
 } // namespace Tegra

src/video_core/renderer_vulkan/blit_image.cpp

@@ -1032,7 +1032,7 @@ void BlitImageHelper::ConvertDepthToColorPipeline(vk::Pipeline& pipeline, VkRend
     VkShaderModule frag_shader = *convert_float_to_depth_frag;
     const std::array stages = MakeStages(*full_screen_vert, frag_shader);
     const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);
-    pipeline = device.GetLogical().CreateGraphicsPipeline({
+    pipeline = device.GetLogical().CreateGraphicsPipeline(VkGraphicsPipelineCreateInfo{
         .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,
@@ -1062,7 +1062,7 @@ void BlitImageHelper::ConvertColorToDepthPipeline(vk::Pipeline& pipeline, VkRend
     VkShaderModule frag_shader = *convert_depth_to_float_frag;
     const std::array stages = MakeStages(*full_screen_vert, frag_shader);
     const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);
-    pipeline = device.GetLogical().CreateGraphicsPipeline({
+    pipeline = device.GetLogical().CreateGraphicsPipeline(VkGraphicsPipelineCreateInfo{
         .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,
@@ -1093,7 +1093,7 @@ void BlitImageHelper::ConvertPipelineEx(vk::Pipeline& pipeline, VkRenderPass ren
     }
     const std::array stages = MakeStages(*full_screen_vert, *module);
     const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);
-    pipeline = device.GetLogical().CreateGraphicsPipeline({
+    pipeline = device.GetLogical().CreateGraphicsPipeline(VkGraphicsPipelineCreateInfo{
         .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,
@@ -1135,7 +1135,7 @@ void BlitImageHelper::ConvertPipeline(vk::Pipeline& pipeline, VkRenderPass rende
         is_target_depth ? *convert_float_to_depth_frag : *convert_depth_to_float_frag;
     const std::array stages = MakeStages(*full_screen_vert, frag_shader);
     const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);
-    pipeline = device.GetLogical().CreateGraphicsPipeline({
+    pipeline = device.GetLogical().CreateGraphicsPipeline(VkGraphicsPipelineCreateInfo{
         .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,

src/video_core/renderer_vulkan/pipeline_helper.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -61,7 +64,8 @@ public:
             .pDescriptorUpdateEntries = entries.data(),
             .templateType = type,
             .descriptorSetLayout = descriptor_set_layout,
-            .pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS,
+            .pipelineBindPoint =
+                is_compute ? VK_PIPELINE_BIND_POINT_COMPUTE : VK_PIPELINE_BIND_POINT_GRAPHICS,
             .pipelineLayout = pipeline_layout,
             .set = 0,
         });
@@ -122,7 +126,7 @@ private:
             });
             ++binding;
             num_descriptors += descriptors[i].count;
-            offset += sizeof(DescriptorUpdateEntry);
+            offset += sizeof(DescriptorUpdateEntry) * descriptors[i].count;
         }
     }
 

src/video_core/renderer_vulkan/present/util.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -6,6 +6,7 @@
 
 #include "common/assert.h"
 #include <ranges>
+#include <vulkan/vulkan_core.h>
 #include "video_core/renderer_vulkan/present/util.h"
 
 namespace Vulkan {
@@ -629,8 +630,8 @@ vk::Sampler CreateCubicSampler(const Device& device, VkCubicFilterWeightsQCOM qc
         .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
         .pNext = nullptr,
         .flags = 0,
-        .magFilter = VK_FILTER_CUBIC_EXT,
-        .minFilter = VK_FILTER_CUBIC_EXT,
+        .magFilter = device.IsExtFilterCubicSupported() ? VK_FILTER_CUBIC_EXT : VK_FILTER_LINEAR,
+        .minFilter = device.IsExtFilterCubicSupported() ? VK_FILTER_CUBIC_EXT : VK_FILTER_LINEAR,
         .mipmapMode = VK_SAMPLER_MIPMAP_MODE_NEAREST,
         .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
         .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,

src/video_core/renderer_vulkan/renderer_vulkan.cpp

@@ -137,14 +137,8 @@ try
                       memory_allocator,
                       scheduler,
                       swapchain,
-#ifdef ANDROID
                       surface)
-    ,
-#else
-                      *surface)
-    ,
-#endif
-    blit_swapchain(device_memory,
+    , blit_swapchain(device_memory,
                    device,
                    memory_allocator,
                    present_manager,

src/video_core/renderer_vulkan/vk_blit_screen.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 Torzu Emulator Project
@@ -22,7 +22,8 @@ BlitScreen::BlitScreen(Tegra::MaxwellDeviceMemoryManager& device_memory_, const
                        MemoryAllocator& memory_allocator_, PresentManager& present_manager_,
                        Scheduler& scheduler_, const PresentFilters& filters_)
     : device_memory{device_memory_}, device{device_}, memory_allocator{memory_allocator_},
-      present_manager{present_manager_}, scheduler{scheduler_}, filters{filters_}, image_count{1},
+      present_manager{present_manager_}, scheduler{scheduler_}, filters{filters_},
+      image_count{1}, image_index{0},
       swapchain_view_format{VK_FORMAT_B8G8R8A8_UNORM} {}
 
 BlitScreen::~BlitScreen() = default;
@@ -87,57 +88,49 @@ void BlitScreen::DrawToFrame(RasterizerVulkan& rasterizer, Frame* frame,
     bool resource_update_required = false;
     bool presentation_recreate_required = false;
 
-    // Recreate dynamic resources if the adapting filter changed
     if (!window_adapt || scaling_filter != filters.get_scaling_filter()) {
         resource_update_required = true;
     }
 
-    // Recreate dynamic resources if the image count changed
-    const size_t old_swapchain_image_count =
-        std::exchange(image_count, current_swapchain_image_count);
-    if (old_swapchain_image_count != current_swapchain_image_count) {
+    if (image_count != current_swapchain_image_count) {
         resource_update_required = true;
+        image_count = current_swapchain_image_count;
     }
 
-    // Recreate the presentation frame if the format or dimensions of the window changed
-    const VkFormat old_swapchain_view_format =
-        std::exchange(swapchain_view_format, current_swapchain_view_format);
-    if (old_swapchain_view_format != current_swapchain_view_format ||
+    if (swapchain_view_format != current_swapchain_view_format ||
         layout.width != frame->width || layout.height != frame->height) {
         resource_update_required = true;
         presentation_recreate_required = true;
+        swapchain_view_format = current_swapchain_view_format;
     }
 
-    // If we have a pending resource update, perform it
     if (resource_update_required) {
-        // Wait for idle to ensure no resources are in use
         WaitIdle();
-
-        // Update window adapt pass
         SetWindowAdaptPass();
 
-        // Update frame format if needed
         if (presentation_recreate_required) {
             present_manager.RecreateFrame(frame, layout.width, layout.height, swapchain_view_format,
                                           window_adapt->GetRenderPass());
         }
+
+        image_index = 0;
     }
 
-    // Add additional layers if needed
     const VkExtent2D window_size{
         .width = layout.screen.GetWidth(),
         .height = layout.screen.GetHeight(),
     };
 
-    while (layers.size() < framebuffers.size()) {
-        layers.emplace_back(device, memory_allocator, scheduler, device_memory, image_count,
-                            window_size, window_adapt->GetDescriptorSetLayout(), filters);
+    if (layers.size() != framebuffers.size()) {
+        layers.clear();
+        for (size_t i = 0; i < framebuffers.size(); ++i) {
+            layers.emplace_back(device, memory_allocator, scheduler, device_memory, image_count,
+                                window_size, window_adapt->GetDescriptorSetLayout(), filters);
+        }
     }
 
-    // Perform the draw
     window_adapt->Draw(rasterizer, scheduler, image_index, layers, framebuffers, layout, frame);
 
-    // Advance to next image
     if (++image_index >= image_count) {
         image_index = 0;
     }
@@ -146,16 +139,20 @@ void BlitScreen::DrawToFrame(RasterizerVulkan& rasterizer, Frame* frame,
 vk::Framebuffer BlitScreen::CreateFramebuffer(const Layout::FramebufferLayout& layout,
                                               VkImageView image_view,
                                               VkFormat current_view_format) {
-    const bool format_updated =
-        std::exchange(swapchain_view_format, current_view_format) != current_view_format;
+    bool format_updated = swapchain_view_format != current_view_format;
+    swapchain_view_format = current_view_format;
+
     if (!window_adapt || scaling_filter != filters.get_scaling_filter() || format_updated) {
         WaitIdle();
         SetWindowAdaptPass();
+        image_index = 0;
     }
+
     const VkExtent2D extent{
         .width = layout.width,
         .height = layout.height,
     };
+
     return CreateFramebuffer(image_view, extent, window_adapt->GetRenderPass());
 }