Blacklist GPU MSAA Blit for KosmicKrisp

2026-08-14 12:56:09 +00:00 · 2026-02-26 00:03:55 -04:00
67 changed files with 507 additions and 745 deletions
@@ -63,4 +63,3 @@ artifacts
 *.AppImage*
 /install*
 vulkansdk*.exe
-*.tar.zst
@@ -70,7 +70,7 @@ endif()
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)
 option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)
-cmake_dependent_option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera"  OFF "NOT YUZU_USE_BUNDLED_QT" OFF)
+# option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)
 cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF "NOT YUZU_USE_BUNDLED_QT" OFF)
 set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")
 cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)
@@ -577,9 +577,9 @@ if (ENABLE_QT)

    find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets Charts Concurrent)

-    if (YUZU_USE_QT_MULTIMEDIA)
-        find_package(Qt6 REQUIRED COMPONENTS Multimedia)
-    endif()
+    # if (YUZU_USE_QT_MULTIMEDIA)
+    #     find_package(Qt6 REQUIRED COMPONENTS Multimedia)
+    # endif()

    if (PLATFORM_LINUX OR PLATFORM_FREEBSD)
        # yes Qt, we get it
@@ -618,9 +618,9 @@ if (ENABLE_QT)
    if (PLATFORM_LINUX)
        list(APPEND YUZU_QT_COMPONENTS DBus)
    endif()
-    if (YUZU_USE_QT_MULTIMEDIA)
-        list(APPEND YUZU_QT_COMPONENTS Multimedia)
-    endif()
+    # if (YUZU_USE_QT_MULTIMEDIA)
+    #     list(APPEND YUZU_QT_COMPONENTS Multimedia)
+    # endif()
    if (YUZU_USE_QT_WEB_ENGINE)
        list(APPEND YUZU_QT_COMPONENTS WebEngineCore WebEngineWidgets)
    endif()
@@ -1,100 +0,0 @@
-# CMake Options
-
-To change these options, add `-DOPTION_NAME=NEWVALUE` to the command line.
-
- On Qt Creator, go to Project -> Current Configuration
-
-Notes:
-
- Defaults are marked per-platform.
- "Non-UNIX" just means Windows/MSVC and Android (yes, macOS is UNIX
- Android generally doesn't need to change anything; if you do, go to `src/android/app/build.gradle.kts`
- To set a boolean variable to on, use `ON` for the value; to turn it off, use `OFF`
- If a variable is mentioned as being e.g. "ON" for a specific platform(s), that means it is defaulted to OFF on others
- TYPE is always boolean unless otherwise specified
- Format:
-  - `OPTION_NAME` (TYPE DEFAULT) DESCRIPTION
-
-## Options
-
-### Dependencies
-
-These options control dependencies.
-
- `YUZU_USE_BUNDLED_FFMPEG` (ON for non-UNIX) Download a pre-built and configured FFmpeg
- `YUZU_USE_EXTERNAL_FFMPEG` (ON for Solaris) Build FFmpeg from source
- `YUZU_DOWNLOAD_ANDROID_VVL` (ON) Download validation layer binary for Android
- `YUZU_DOWNLOAD_TIME_ZONE_DATA` (ON) Always download time zone binaries
-  - Currently, build fails without this
- `YUZU_TZDB_PATH` (string) Path to a pre-downloaded timezone database (useful for nixOS and Gentoo)
- `YUZU_USE_BUNDLED_MOLTENVK` (ON, macOS only) Download bundled MoltenVK lib
- `YUZU_USE_BUNDLED_OPENSSL` (ON for MSVC, Android, Solaris, and OpenBSD) Download bundled OpenSSL build
- `YUZU_USE_EXTERNAL_SDL2` (OFF) Compiles SDL2 from source
- `YUZU_USE_BUNDLED_SDL2` (ON for MSVC) Download a prebuilt SDL2
-
-### Miscellaneous
-
- `ENABLE_WEB_SERVICE` (ON) Enable multiplayer service
- `ENABLE_WIFI_SCAN` (OFF) Enable WiFi scanning (requires iw on Linux) - experimental
- `ENABLE_CUBEB` (ON) Enables the cubeb audio backend
-  - This option is subject for removal.
- `YUZU_TESTS` (ON) Compile tests - requires Catch2
- `ENABLE_LTO` (OFF) Enable link-time optimization
-  - Not recommended on Windows
-  - UNIX may be better off appending `-flto=thin` to compiler args
- `USE_FASTER_LINKER` (OFF) Check if a faster linker is available
-  - Not recommended outside of Linux
-
-### Flavors
-
-These options control executables and build flavors.
-
- `YUZU_LEGACY` (OFF): Apply patches to improve compatibility on some older GPUs at the cost of performance
- `NIGHTLY_BUILD` (OFF): This is only used by CI. Do not use this unless you're making your own distribution and know what you're doing.
- `YUZU_STATIC_BUILD` (OFF) Attempt to build using static libraries if possible
-  - Not supported on Linux
-  - Automatically set if `YUZU_USE_BUNDLED_QT` is on for non-Linux
- `ENABLE_UPDATE_CHECKER` (OFF) Enable update checking functionality
- `YUZU_DISABLE_LLVM` (OFF) Do not attempt to link to the LLVM demangler
-  - Really only useful for CI or distribution builds
-
-**Desktop only**:
-
- `YUZU_CMD` (ON) Compile the SDL2 frontend (eden-cli)
- `YUZU_ROOM` (OFF) Compile dedicated room functionality into the main executable
- `YUZU_ROOM_STANDALONE` (OFF) Compile a separate executable for room functionality
- `YUZU_STATIC_ROOM` (OFF) Compile the room executable *only* as a static, portable executable
-  - This is only usable on Alpine Linux.
-
-### Desktop
-
-The following options are desktop only.
-
- `ENABLE_LIBUSB` (ON) Enable the use of the libusb input frontend (HIGHLY RECOMMENDED)
- `ENABLE_OPENGL` (ON) Enable the OpenGL graphics frontend
-  - Unavailable on Windows/ARM64
-  - You probably shouldn't turn this off.
-
-### Qt
-
-Also desktop-only, but apply strictly to Qt
-
- `ENABLE_QT` (ON) Enable the Qt frontend (recommended)
- `ENABLE_QT_TRANSLATION` (OFF) Enable translations for the Qt frontend
- `YUZU_USE_BUNDLED_QT` (ON for MSVC) Download bundled Qt binaries
-  - Not recommended on Linux. For Windows and macOS, the provided build is statically linked.
- `YUZU_QT_MIRROR` (string) What mirror to use for downloading the bundled Qt libraries
- `YUZU_USE_QT_MULTIMEDIA` (OFF) Use QtMultimedia for camera support
- `YUZU_USE_QT_WEB_ENGINE` (OFF) Use QtWebEngine for web applet implementation (requires the huge QtWebEngine dependency; not recommended)
- `USE_DISCORD_PRESENCE` (OFF) Enables Discord Rich Presence (Qt frontend only)
-
-### Retired Options
-
-The following options were a part of Eden at one point, but have since been retired.
-
- `ENABLE_OPENSSL` - MbedTLS was fully replaced with OpenSSL in [#3606](https://git.eden-emu.dev/eden-emu/eden/pulls/3606), because OpenSSL straight-up performs better.
- `ENABLE_SDL2` - While technically possible to *not* use SDL2 on desktop, this is **NOT** a supported configuration under any means, and adding this matrix to our build system was not worth the effort.
- `YUZU_USE_CPM` - This option once had a purpose, but that purpose has long since passed us by. *All* builds use CPMUtil to manage dependencies now.
-  - If you want to *force* the usage of system dependencies, use `-DCPMUTIL_FORCE_SYSTEM=ON`.
-
-See `src/dynarmic/CMakeLists.txt` for additional options--usually, these don't need changed
@@ -3,7 +3,6 @@
 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)**
- **[CMake Options](Options.md)**
 - **[Cross Compiling](CrossCompile.md)**
 - **[Development Guidelines](Development.md)**
 - **[Dependencies](Deps.md)**
@@ -18,7 +18,7 @@ First of all, you MUST have a valid reason to sign up for our Git. Valid reasons
 The following are not valid reasons to sign up:

 - I want to contribute to Eden.
-  * Be at least somewhat specific! We always welcome contributors and developers, but generic "I want to contribute" messages don't give us enough information.
+  * Be at least somewhat specific!
 - I want to support Eden.
  * If you wish to support us through development, be more specific; otherwise, to support us, check out our [donations page](https://eden-emu.dev/donations).
 - I want to report issues.
@@ -41,36 +41,17 @@ Email: <Your Desired Email>
 I wish to sign up because... <your reason here>
 ```

-Email notifications are disabled for the time being, so you don't have to use a real email. If you wish to remain anonymous, either send a separate email asking for access to a shared anonymous account, *or* create a fake username and email. Do note that the email you sign up with is used to accredit commits on the web UI, and *must* match your configured GPG key.
-
-## Patches
-
-In general, PRs are the preferred method of tracking patches, as they allow us to go through our standard triage, CI, and testing process without having to deal with the minutiae of incremental patches. However, we also understand that many people prefer to use raw patches, and that's totally okay! While we currently don't have a mailing list, we do accept email patches. To do so:
-
-1. Make your changes on a clean copy of the master branch
-2. Commit your changes with a descriptive, well-formed message (see the [commit message docs](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/Development.md#pull-requests)), and a proper description thoroughly explaining your changes.
-  * Note that we don't need to know all the individual details about your code. A description explaining the motivation and general implementation of your changes is enough, alongside caveats and any potential blockers.
-3. Format your patch with `git format-patch -1 HEAD`.
-4. Email us with the subject `[Eden] [PATCH] <brief patch description...>`, with a brief description of your patch, and the previously-formatted patch file as an attachment.
-  * If you don't include the first two bracketed parts, your email may be lost!
-
-The following emails are currently set up to receive and process patches:
-
- [eden@eden-emu.dev](mailto:eden@eden-emu.dev]
- [crueter@eden-emu.dev](mailto:eden@eden-emu.dev)
+Email notifications are disabled for the time being, so you don't have to use a real email. If you wish to remain anonymous, either send a separate email asking for access to a shared anonymous account, *or* create a fake username and email.

 ## Instructions

 If you have read everything above and affirm that you will not abuse your access, click the summary below to get the email to send your request to.

 <details>
-<summary>I affirm that I have read ALL of the information above, and will not abuse my access to Eden, nor will I send unnecessary spam to the following email.</summary>
+<summary>I affirm that I have read ALL of the information above, and will not abuse my access to Eden, nor will I send unnecessary spam requests or the following email.</summary>

 Email [crueter@crueter.xyz](mailto:crueter@crueter.xyz) with the format above.

 Once your request is processed, you should receive a confirmation email from crueter with your password alongside a link to a repository containing instructions on SSH, etc. Note that you are required to change your password. If your request is rejected, you will receive a notice as such, asking for clarification if needed. If you do not receive a response in 48 hours, you may send another email.

-> [!WARNING]
-> Some email providers may place the response email in your spam/junk folder; notable offenders include Gmail and Outlook. *Always* ensure to check your Spam/Junk folder, until Google/Microsoft finally end their vendetta against the great evil of my `.xyz` domain.
-
-</details>
+</details>
@@ -17,9 +17,7 @@ AI is notorious for hallucinating facts out of thin air and sometimes outright l
 - Code that works, but is extraordinarily verbose or not nearly as efficient as it can be
 - Code that works well and is written well, but solves a different problem than was intended, or solves the same problem but in a completely incorrect way that will break other things horribly.

-Human-written code will, without exception, always be of infinitely higher quality when properly researched and implemented by someone familiar with *both* the surrounding code and the programming language in use. LLMs may produce a "good enough" result, but this result is often subpar.
-
-**All code is held under a STRICT STANDARD OF EXCELLENCE**. AI code is no different, and since it often produces subpar or outright terrible code, it will often fail to meet this excellence standard.
+Human-written code will, without exception, always be of infinitely higher quality when properly researched and implemented by someone both familiar with the surrounding code and the programming language in use. LLMs may produce a "good enough" result, but this result is often subpar. Keep in mind: all code is held under a standard of excellence. If your code sucks, it will be rejected. AI-generated code just so happens to be a particularly sucky genre of code, and will thus be held to this same standard.

 On a lesser-known note, LLM outputs often contain unicode symbols such as emojis or the arrow symbol. Please don't put Unicode symbols in your code. It messes with many an IDE, and the three people viewing your code on Lynx will be very unhappy.

@@ -27,8 +25,7 @@ On a lesser-known note, LLM outputs often contain unicode symbols such as emojis

 ## Acceptable Use

-As stated previously, AI is good in a few *very specific* cases. In these cases, it's usually fine to use AI, as long as you **explicitly provide notice that it was used**.
-
+- As stated previously, AI is good in a few *very specific* cases. In these cases, it's usually fine to use AI, as long as you **explicitly provide notice that it was used**.
 - Anything directly outside of the realm of the code written in your PR or patch is none of our business.
  - This primarily covers research.
  - However, we *still* strongly discourage this for the reasons mentioned above.
@@ -107,6 +104,4 @@ This consolidates profile removal behavior, fixes potential race conditions in t

 This has all of the same problems as the other one. Needlessly verbose, doesn't address *what* it actually fixes ("consolidates profile removal behavior"... okay, why? What does it fix?), etc. It even has the bonus of totally hallucinating the addition of a method!

-On a more "philosophical" note, LLMs tend to be geared towards *corporate language*, as that's what they're trained on. This is why AI-generated commit messages feel like "word salad", and typically pad out the commit message to make it *look* like a lot of things were changed (trust me, it's like that in the corporate world). They typically also drift towards unneeded buzzwords and useless implementation details.
-
 **Don't use AI for commit messages**.
@@ -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
+    spirv-tools spirv-headers vulkan-loader unzip mbedtls
    glslang python3 httplib cpp-jwt ffmpeg-headless
    libusb1 cubeb
    # eden
@@ -80,6 +80,7 @@ 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",
@@ -152,10 +152,6 @@ object NativeLibrary {

    external fun surfaceDestroyed()

-    external fun getAppletCaptureBuffer(): ByteArray
-    external fun getAppletCaptureWidth(): Int
-    external fun getAppletCaptureHeight(): Int
-
    /**
     * Unpauses emulation from a paused state.
     */
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -204,9 +204,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    }

    override fun onPause() {
+        super.onPause()
        nfcReader.stopScanning()
        stopMotionSensorListener()
-        super.onPause()
    }

    override fun onDestroy() {
@@ -339,10 +339,6 @@ 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
@@ -34,7 +34,6 @@ 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"),
@@ -1124,24 +1124,23 @@ class SettingsFragmentPresenter(
            }

            val staticThemeColor: AbstractIntSetting = object : AbstractIntSetting {
+                val preferences = PreferenceManager.getDefaultSharedPreferences(
+                    YuzuApplication.appContext
+                )
                override fun getInt(needsGlobal: Boolean): Int =
-                    IntSetting.STATIC_THEME_COLOR.getInt(needsGlobal)
-
+                    preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0)
                override fun setInt(value: Int) {
-                    IntSetting.STATIC_THEME_COLOR.setInt(value)
+                    preferences.edit() { putInt(Settings.PREF_STATIC_THEME_COLOR, value) }
                    settingsViewModel.setShouldRecreate(true)
                }

-                override val key: String = IntSetting.STATIC_THEME_COLOR.key
+                override val key: String = Settings.PREF_STATIC_THEME_COLOR
                override val isRuntimeModifiable: Boolean = true
-
                override fun getValueAsString(needsGlobal: Boolean): String =
-                    IntSetting.STATIC_THEME_COLOR.getValueAsString(needsGlobal)
-
-                override val defaultValue: Any = IntSetting.STATIC_THEME_COLOR.defaultValue
-
+                    preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0).toString()
+                override val defaultValue: Any = 0
                override fun reset() {
-                    IntSetting.STATIC_THEME_COLOR.reset()
+                    preferences.edit() { putInt(Settings.PREF_STATIC_THEME_COLOR, 0) }
                    settingsViewModel.setShouldRecreate(true)
                }
            }
@@ -15,7 +15,6 @@ 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.*
@@ -98,7 +97,6 @@ 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
@@ -143,7 +141,6 @@ 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
@@ -706,12 +703,6 @@ 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) {
@@ -737,9 +728,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            when (it.itemId) {
                R.id.menu_pause_emulation -> {
                    if (emulationState.isPaused) {
-                        resumeEmulationFromUi()
+                        emulationState.run(false)
+                        updatePauseMenuEntry(false)
                    } else {
-                        pauseEmulationAndCaptureFrame()
+                        emulationState.pause()
+                        updatePauseMenuEntry(true)
                    }
                    binding.inGameMenu.requestFocus()
                    true
@@ -833,7 +826,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                }

                R.id.menu_exit -> {
-                    clearPausedFrame()
                    emulationState.stop()
                    NativeConfig.reloadGlobalConfig()
                    emulationViewModel.setIsEmulationStopping(true)
@@ -1205,71 +1197,6 @@ 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

@@ -1363,9 +1290,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    override fun onPause() {
        if (this::emulationState.isInitialized) {
            if (emulationState.isRunning && emulationActivity?.isInPictureInPictureMode != true) {
-                pauseEmulationAndCaptureFrame()
-            } else {
-                updatePausedFrameVisibility()
+                emulationState.pause()
+                updatePauseMenuEntry(true)
            }
        }
        super.onPause()
@@ -1375,7 +1301,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        super.onDestroyView()
        amiiboLoadJob?.cancel()
        amiiboLoadJob = null
-        clearPausedFrame()
        _binding?.surfaceInputOverlay?.touchEventListener = null
        _binding = null
        isAmiiboPickerOpen = false
@@ -1396,7 +1321,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            b.inGameMenu.post {
                if (!this::emulationState.isInitialized || _binding == null) return@post
                updatePauseMenuEntry(emulationState.isPaused)
-                updatePausedFrameVisibility()
            }
        }

@@ -1836,7 +1760,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            // Only update surface reference, don't trigger state changes
            emulationState.updateSurfaceReference(holder.surface)
        }
-        updatePausedFrameVisibility()
    }

    override fun surfaceDestroyed(holder: SurfaceHolder) {
@@ -2167,29 +2090,6 @@ 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()
@@ -2211,7 +2111,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {

        @Synchronized
        fun updateSurface() {
-            if (surface != null && state == State.RUNNING) {
+            if (surface != null) {
                NativeLibrary.surfaceChanged(surface)
            }
        }
@@ -2227,20 +2127,20 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        @Synchronized
        fun clearSurface() {
            if (surface == null) {
-                Log.debug("[EmulationFragment] clearSurface called, but surface already null.")
+                Log.warning("[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.PAUSED -> Log.debug(
+                    State.RUNNING -> {
+                        state = State.PAUSED
+                    }
+
+                    State.PAUSED -> Log.warning(
                        "[EmulationFragment] Surface cleared while emulation paused."
                    )

-                    else -> Log.debug(
+                    else -> Log.warning(
                        "[EmulationFragment] Surface cleared while emulation stopped."
                    )
                }
@@ -2248,35 +2148,29 @@ 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] Surface restored while emulation paused; " +
-                            "waiting for explicit resume."
-                    )
+                    Log.debug("[EmulationFragment] Resuming emulation.")
+                    NativeLibrary.unpauseEmulation()
+                    NativeLibrary.playTimeManagerStart()
                }

                else -> Log.debug("[EmulationFragment] Bug, run called while already running.")
            }
+            state = State.RUNNING
        }

        private enum class State {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.overlay
@@ -20,6 +20,7 @@ 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
@@ -41,10 +42,10 @@ import org.yuzu.yuzu_emu.utils.NativeConfig

 /**
 * Draws the interactive input overlay on top of the
- * emulation rendering surface.
+ * [SurfaceView] that is rendering emulation.
 */
 class InputOverlay(context: Context, attrs: AttributeSet?) :
-    View(context, attrs),
+    SurfaceView(context, attrs),
    OnTouchListener {
    private val overlayButtons: MutableSet<InputOverlayDrawableButton> = HashSet()
    private val overlayDpads: MutableSet<InputOverlayDrawableDpad> = HashSet()
@@ -61,12 +61,6 @@ 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) {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: 2025 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 = IntSetting.STATIC_THEME_COLOR.getInt(false)
+        val themeIndex = preferences.getInt(Settings.PREF_STATIC_THEME_COLOR, 0)
        val themes = arrayOf(
            R.style.Theme_Eden_Main,
            R.style.Theme_Yuzu_Main_Violet,
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -11,7 +11,8 @@ 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.IntSetting
+import org.yuzu.yuzu_emu.features.settings.model.Settings
+import androidx.preference.PreferenceManager

 class GradientBorderCardView @JvmOverloads constructor(
    context: Context,
@@ -43,7 +44,12 @@ class GradientBorderCardView @JvmOverloads constructor(
    }

    private fun updateThemeState() {
-        val themeIndex = IntSetting.STATIC_THEME_COLOR.getInt(false)
+        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
+        }
        isEdenTheme = themeIndex == 0
        invalidate()
    }
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
@@ -27,7 +27,10 @@ if (ARCHITECTURE_arm64)
    target_link_libraries(yuzu-android PRIVATE adrenotools)
 endif()

-target_link_libraries(yuzu-android PRIVATE OpenSSL::SSL cpp-jwt::cpp-jwt)
+if (ENABLE_OPENSSL OR ENABLE_WEB_SERVICE)
+    target_link_libraries(yuzu-android PRIVATE OpenSSL::SSL cpp-jwt::cpp-jwt)
+endif()
+
 if (ENABLE_UPDATE_CHECKER)
    target_compile_definitions(yuzu-android PUBLIC ENABLE_UPDATE_CHECKER)
 endif()
@@ -56,7 +56,6 @@ 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};
@@ -1,6 +1,3 @@
-// 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

@@ -17,14 +14,6 @@
 #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);

@@ -89,8 +89,6 @@
 #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"
@@ -782,10 +780,9 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject i
 }

 void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jobject instance) {
-    if (auto* native_window = EmulationSession::GetInstance().NativeWindow(); native_window) {
-        ANativeWindow_release(native_window);
-    }
+    ANativeWindow_release(EmulationSession::GetInstance().NativeWindow());
    EmulationSession::GetInstance().SetNativeWindow(nullptr);
+    EmulationSession::GetInstance().SurfaceChanged();
 }

 void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject instance,
@@ -972,40 +969,6 @@ 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.
@@ -1,4 +0,0 @@
-<?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>
@@ -108,22 +108,6 @@

        </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"
@@ -158,18 +142,6 @@
            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"
@@ -1222,12 +1222,12 @@

    <!-- Static Themes -->
    <string name="static_theme_color">Theme Color</string>
-    <string name="eden_theme">Eden</string>
+    <string name="eden_theme">Eden (Default)</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 (Default)</string>
+    <string name="green">Green</string>
    <string name="yellow">Yellow</string>
    <string name="orange">Orange</string>
    <string name="pink">Pink</string>
@@ -342,6 +342,7 @@ add_library(core STATIC
    hle/kernel/message_buffer.h
    hle/kernel/physical_core.cpp
    hle/kernel/physical_core.h
+    hle/kernel/physical_memory.h
    hle/kernel/slab_helpers.h
    hle/kernel/svc.cpp
    hle/kernel/svc.h
@@ -4,7 +4,6 @@
 #include <numeric>
 #include <bit>
 #include "common/arm64/native_clock.h"
-#include "common/alignment.h"
 #include "common/literals.h"
 #include "core/arm/nce/arm_nce.h"
 #include "core/arm/nce/guest_context.h"
@@ -47,7 +46,8 @@ Patcher::Patcher() : c(m_patch_instructions), c_pre(m_patch_instructions_pre) {

 Patcher::~Patcher() = default;

-bool Patcher::PatchText(std::span<const u8> program_image, const Kernel::CodeSet::Segment& code) {
+bool Patcher::PatchText(const Kernel::PhysicalMemory& program_image,
+                        const Kernel::CodeSet::Segment& code) {
    // If we have patched modules but cannot reach the new module, then it needs its own patcher.
    const size_t image_size = program_image.size();

@@ -175,7 +175,10 @@ bool Patcher::PatchText(std::span<const u8> program_image, const Kernel::CodeSet
    return true;
 }

-bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base, const Kernel::CodeSet::Segment& code, std::vector<u8>& program_image, EntryTrampolines* out_trampolines) {
+bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
+                              const Kernel::CodeSet::Segment& code,
+                              Kernel::PhysicalMemory& program_image,
+                              EntryTrampolines* out_trampolines) {
    const size_t patch_size = GetSectionSize();
    const size_t pre_patch_size = GetPreSectionSize();

@@ -14,6 +14,7 @@
 #include "common/settings.h"
 #include "core/hle/kernel/code_set.h"
 #include "core/hle/kernel/k_typed_address.h"
+#include "core/hle/kernel/physical_memory.h"
 #include <utility>
 using ModuleID = std::array<u8, 32>;  // NSO build ID
 struct PatchCacheKey {
@@ -55,8 +56,10 @@ public:
    }
    explicit Patcher();
    ~Patcher();
-    bool PatchText(std::span<const u8> program_image, const Kernel::CodeSet::Segment& code);
-    bool RelocateAndCopy(Common::ProcessAddress load_base, const Kernel::CodeSet::Segment& code, std::vector<u8>& program_image, EntryTrampolines* out_trampolines);
+    bool PatchText(const Kernel::PhysicalMemory& program_image,
+                   const Kernel::CodeSet::Segment& code);
+    bool RelocateAndCopy(Common::ProcessAddress load_base, const Kernel::CodeSet::Segment& code,
+                         Kernel::PhysicalMemory& program_image, EntryTrampolines* out_trampolines);
    size_t GetSectionSize() const noexcept;
    size_t GetPreSectionSize() const noexcept;

@@ -38,6 +38,7 @@ 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";
@@ -52,6 +53,7 @@ static inline const std::string GetCipherName(Mode mode, u32 key_size) {
    default:
        UNREACHABLE();
    }
+
    return fmt::format("AES-{}-{}", effective_bits, cipher);
 };

@@ -85,7 +87,8 @@ 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();
@@ -96,7 +99,9 @@ Crypto::AESCipher<Key, KeySize>::AESCipher(Key key, Mode mode) : ctx(std::make_u
        UNIMPLEMENTED();
    }

-    ASSERT(ctx->encryption_context && ctx->decryption_context && ctx->cipher && "OpenSSL cipher context failed init!");
+    ASSERT_MSG(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));
@@ -160,7 +165,8 @@ 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(size % sector_size == 0 && "XTS decryption size must be a multiple of sector size.");
+    ASSERT_MSG(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);
@@ -171,7 +177,8 @@ 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(ret_enc == 1 && ret_dec == 1 && "Failed to set IV on OpenSSL contexts");
+
+    ASSERT_MSG(ret_enc == 1 && ret_dec == 1, "Failed to set IV on OpenSSL contexts");
 }

 template class AESCipher<Key128>;
@@ -0,0 +1,4 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+namespace Crypto {} // namespace Crypto
@@ -0,0 +1,19 @@
+// 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
@@ -1,6 +1,3 @@
-// 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

@@ -163,15 +160,15 @@ u32 KIP::GetMainThreadCpuCore() const {
    return header.default_core;
 }

-std::span<const u8> KIP::GetTextSection() const {
+const std::vector<u8>& KIP::GetTextSection() const {
    return decompressed_sections[0];
 }

-std::span<const u8> KIP::GetRODataSection() const {
+const std::vector<u8>& KIP::GetRODataSection() const {
    return decompressed_sections[1];
 }

-std::span<const u8> KIP::GetDataSection() const {
+const std::vector<u8>& KIP::GetDataSection() const {
    return decompressed_sections[2];
 }

@@ -1,13 +1,9 @@
-// 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

 #pragma once

 #include <array>
-#include <span>
 #include <string>
 #include <vector>

@@ -74,9 +70,9 @@ public:
    u32 GetMainThreadStackSize() const;
    u32 GetMainThreadCpuCore() const;

-    std::span<const u8> GetTextSection() const;
-    std::span<const u8> GetRODataSection() const;
-    std::span<const u8> GetDataSection() const;
+    const std::vector<u8>& GetTextSection() const;
+    const std::vector<u8>& GetRODataSection() const;
+    const std::vector<u8>& GetDataSection() const;

    u32 GetTextOffset() const;
    u32 GetRODataOffset() const;
@@ -7,9 +7,9 @@
 #pragma once

 #include <cstddef>
-#include <vector>

 #include "core/hle/kernel/k_typed_address.h"
+#include "core/hle/kernel/physical_memory.h"

 namespace Kernel {

@@ -97,7 +97,8 @@ struct CodeSet final {
 #endif

    /// The overall data that backs this code set.
-    std::vector<u8> memory;
+    Kernel::PhysicalMemory memory;
+
    /// The segments that comprise this code set.
    std::array<Segment, 3> segments;

@@ -0,0 +1,23 @@
+// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <vector>
+
+#include "common/alignment.h"
+
+namespace Kernel {
+
+// This encapsulation serves 2 purposes:
+// - First, to encapsulate host physical memory under a single type and set an
+// standard for managing it.
+// - Second to ensure all host backing memory used is aligned to 256 bytes due
+// to strict alignment restrictions on GPU memory.
+
+using PhysicalMemoryVector = std::vector<u8, Common::AlignmentAllocator<u8, 256>>;
+class PhysicalMemory final : public PhysicalMemoryVector {
+    using PhysicalMemoryVector::PhysicalMemoryVector;
+};
+
+} // namespace Kernel
@@ -1,6 +1,3 @@
-// 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

@@ -96,7 +93,7 @@ union Error::ErrorArguments {

 namespace {
 template <typename T>
-void CopyArgumentData(std::span<const u8> data, T& variable) {
+void CopyArgumentData(const std::vector<u8>& data, T& variable) {
    ASSERT(data.size() >= sizeof(T));
    std::memcpy(&variable, data.data(), sizeof(T));
 }
@@ -1,6 +1,3 @@
-// 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

@@ -778,7 +775,7 @@ Result SoftwareKeyboard::RequestExit() {

 // Inline Software Keyboard Requests

-void SoftwareKeyboard::RequestFinalize(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestFinalize(const std::vector<u8>& request_data) {
    LOG_DEBUG(Service_AM, "Processing Request: Finalize");

    ChangeState(SwkbdState::NotInitialized);
@@ -786,17 +783,17 @@ void SoftwareKeyboard::RequestFinalize(std::span<const u8> request_data) {
    ExitKeyboard();
 }

-void SoftwareKeyboard::RequestSetUserWordInfo(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestSetUserWordInfo(const std::vector<u8>& request_data) {
    LOG_WARNING(Service_AM, "SetUserWordInfo is not implemented.");

    ReplyReleasedUserWordInfo();
 }

-void SoftwareKeyboard::RequestSetCustomizeDic(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestSetCustomizeDic(const std::vector<u8>& request_data) {
    LOG_WARNING(Service_AM, "SetCustomizeDic is not implemented.");
 }

-void SoftwareKeyboard::RequestCalc(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestCalc(const std::vector<u8>& request_data) {
    LOG_DEBUG(Service_AM, "Processing Request: Calc");

    ASSERT(request_data.size() >= sizeof(SwkbdRequestCommand) + sizeof(SwkbdCalcArgCommon));
@@ -933,17 +930,17 @@ void SoftwareKeyboard::RequestCalcNew() {
    }
 }

-void SoftwareKeyboard::RequestSetCustomizedDictionaries(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestSetCustomizedDictionaries(const std::vector<u8>& request_data) {
    LOG_WARNING(Service_AM, "SetCustomizedDictionaries is not implemented.");
 }

-void SoftwareKeyboard::RequestUnsetCustomizedDictionaries(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestUnsetCustomizedDictionaries(const std::vector<u8>& request_data) {
    LOG_WARNING(Service_AM, "(STUBBED) Processing Request: UnsetCustomizedDictionaries");

    ReplyUnsetCustomizedDictionaries();
 }

-void SoftwareKeyboard::RequestSetChangedStringV2Flag(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestSetChangedStringV2Flag(const std::vector<u8>& request_data) {
    LOG_DEBUG(Service_AM, "Processing Request: SetChangedStringV2Flag");

    ASSERT(request_data.size() == sizeof(SwkbdRequestCommand) + 1);
@@ -951,7 +948,7 @@ void SoftwareKeyboard::RequestSetChangedStringV2Flag(std::span<const u8> request
    std::memcpy(&use_changed_string_v2, request_data.data() + sizeof(SwkbdRequestCommand), 1);
 }

-void SoftwareKeyboard::RequestSetMovedCursorV2Flag(std::span<const u8> request_data) {
+void SoftwareKeyboard::RequestSetMovedCursorV2Flag(const std::vector<u8>& request_data) {
    LOG_DEBUG(Service_AM, "Processing Request: SetMovedCursorV2Flag");

    ASSERT(request_data.size() == sizeof(SwkbdRequestCommand) + 1);
@@ -1,6 +1,3 @@
-// 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

@@ -127,16 +124,16 @@ private:

    // Inline Software Keyboard Requests

-    void RequestFinalize(std::span<const u8> request_data);
-    void RequestSetUserWordInfo(std::span<const u8> request_data);
-    void RequestSetCustomizeDic(std::span<const u8> request_data);
-    void RequestCalc(std::span<const u8> request_data);
+    void RequestFinalize(const std::vector<u8>& request_data);
+    void RequestSetUserWordInfo(const std::vector<u8>& request_data);
+    void RequestSetCustomizeDic(const std::vector<u8>& request_data);
+    void RequestCalc(const std::vector<u8>& request_data);
    void RequestCalcOld();
    void RequestCalcNew();
-    void RequestSetCustomizedDictionaries(std::span<const u8> request_data);
-    void RequestUnsetCustomizedDictionaries(std::span<const u8> request_data);
-    void RequestSetChangedStringV2Flag(std::span<const u8> request_data);
-    void RequestSetMovedCursorV2Flag(std::span<const u8> request_data);
+    void RequestSetCustomizedDictionaries(const std::vector<u8>& request_data);
+    void RequestUnsetCustomizedDictionaries(const std::vector<u8>& request_data);
+    void RequestSetChangedStringV2Flag(const std::vector<u8>& request_data);
+    void RequestSetMovedCursorV2Flag(const std::vector<u8>& request_data);

    // Inline Software Keyboard Replies

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -34,21 +34,22 @@ namespace Service::AM::Frontend {
 namespace {

 template <typename T>
-void ParseRawValue(T& value, std::span<const u8> data) {
+void ParseRawValue(T& value, const std::vector<u8>& data) {
    static_assert(std::is_trivially_copyable_v<T>,
                  "It's undefined behavior to use memcpy with non-trivially copyable objects");
    std::memcpy(&value, data.data(), data.size());
 }

 template <typename T>
-T ParseRawValue(std::span<const u8> data) {
+T ParseRawValue(const std::vector<u8>& data) {
    T value;
    ParseRawValue(value, data);
    return value;
 }

-std::string ParseStringValue(std::span<const u8> data) {
-    return Common::StringFromFixedZeroTerminatedBuffer(reinterpret_cast<const char*>(data.data()), data.size());
+std::string ParseStringValue(const std::vector<u8>& data) {
+    return Common::StringFromFixedZeroTerminatedBuffer(reinterpret_cast<const char*>(data.data()),
+                                                       data.size());
 }

 std::string GetMainURL(const std::string& url) {
@@ -71,7 +72,7 @@ std::string ResolveURL(const std::string& url) {
    return url.substr(0, index) + "lp1" + url.substr(index + 1);
 }

-WebArgInputTLVMap ReadWebArgs(std::span<const u8> web_arg, WebArgHeader& web_arg_header) {
+WebArgInputTLVMap ReadWebArgs(const std::vector<u8>& web_arg, WebArgHeader& web_arg_header) {
    std::memcpy(&web_arg_header, web_arg.data(), sizeof(WebArgHeader));

    if (web_arg.size() == sizeof(WebArgHeader)) {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -36,8 +36,8 @@ IAudioDevice::IAudioDevice(Core::System& system_, u64 applet_resource_user_id, u
        {16, nullptr, "ReleaseAudioInputDeviceNotification"}, //17.0.0+
        {17, nullptr, "AcquireAudioOutputDeviceNotification"}, //17.0.0+
        {18, nullptr, "ReleaseAudioOutputDeviceNotification"}, //17.0.0+
-        {19, D<&IAudioDevice::SetAudioDeviceOutputVolumeAutoTuneEnabled>, "SetAudioDeviceOutputVolumeAutoTuneEnabled"}, //18.0.0+
-        {20, D<&IAudioDevice::IsAudioDeviceOutputVolumeAutoTuneEnabled>, "IsAudioDeviceOutputVolumeAutoTuneEnabled"}, //18.0.0+
+        {19, nullptr, "SetAudioDeviceOutputVolumeAutoTuneEnabled"}, //18.0.0+
+        {20, nullptr, "IsAudioDeviceOutputVolumeAutoTuneEnabled"}, //18.0.0+
        {21, nullptr, "IsActiveOutputDeviceEstimatedLowLatency"} //21.0.0+
    };
    RegisterHandlers(functions);
@@ -170,15 +170,4 @@ Result IAudioDevice::ListAudioOutputDeviceName(
    R_SUCCEED();
 }

-Result IAudioDevice::SetAudioDeviceOutputVolumeAutoTuneEnabled(bool enabled) {
-    LOG_WARNING(Service_Audio, "(STUBBED) called");
-    R_SUCCEED();
-}
-
-Result IAudioDevice::IsAudioDeviceOutputVolumeAutoTuneEnabled(Out<bool> out_enabled) {
-    LOG_WARNING(Service_Audio, "(STUBBED) called");
-    *out_enabled = false;
-    R_SUCCEED();
-}
-
 } // namespace Service::Audio
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -52,8 +49,6 @@ private:
    Result ListAudioOutputDeviceName(
        OutArray<AudioDevice::AudioDeviceName, BufferAttr_HipcMapAlias> out_names,
        Out<s32> out_count);
-    Result SetAudioDeviceOutputVolumeAutoTuneEnabled(bool enabled);
-    Result IsAudioDeviceOutputVolumeAutoTuneEnabled(Out<bool> out_enabled);

    KernelHelpers::ServiceContext service_context;
    std::unique_ptr<AudioCore::Renderer::AudioDevice> impl;
@@ -164,7 +164,7 @@ private:
        rb.Push(ResultSuccess);
    }

-    u64 ReadLeb128(std::span<const u8> data, std::size_t& offset) {
+    u64 ReadLeb128(const std::vector<u8>& data, std::size_t& offset) {
        u64 result{};
        u32 shift{};

@@ -180,7 +180,7 @@ private:
        return result;
    }

-    std::optional<std::string> ReadString(std::span<const u8> data, std::size_t& offset,
+    std::optional<std::string> ReadString(const std::vector<u8>& data, std::size_t& offset,
                                          std::size_t length) {
        if (length == 0) {
            return std::nullopt;
@@ -193,7 +193,7 @@ private:
        return output;
    }

-    u32_le ReadAsU32(std::span<const u8> data, std::size_t& offset, std::size_t length) {
+    u32_le ReadAsU32(const std::vector<u8>& data, std::size_t& offset, std::size_t length) {
        ASSERT(length == sizeof(u32));
        u32_le output{};
        std::memcpy(&output, data.data() + offset, sizeof(u32));
@@ -201,7 +201,7 @@ private:
        return output;
    }

-    u64_le ReadAsU64(std::span<const u8> data, std::size_t& offset, std::size_t length) {
+    u64_le ReadAsU64(const std::vector<u8>& data, std::size_t& offset, std::size_t length) {
        ASSERT(length == sizeof(u64));
        u64_le output{};
        std::memcpy(&output, data.data() + offset, sizeof(u64));
@@ -209,7 +209,7 @@ private:
        return output;
    }

-    void ParseLog(const LogPacketHeaderEntry entry, std::span<const u8> log_data) {
+    void ParseLog(const LogPacketHeaderEntry entry, const std::vector<u8>& log_data) {
        // Possible entries
        std::optional<std::string> text_log;
        std::optional<u32> line_number;
@@ -67,7 +67,7 @@ IApplicationManagerInterface::IApplicationManagerInterface(Core::System& system_
        {44, D<&IApplicationManagerInterface::GetSdCardMountStatusChangedEvent>, "GetSdCardMountStatusChangedEvent"},
        {45, nullptr, "GetGameCardAttachmentEvent"},
        {46, nullptr, "GetGameCardAttachmentInfo"},
-        {47, D<&IApplicationManagerInterface::GetTotalSpaceSize>, "GetTotalSpaceSize"},
+        {47, nullptr, "GetTotalSpaceSize"},
        {48, D<&IApplicationManagerInterface::GetFreeSpaceSize>, "GetFreeSpaceSize"},
        {49, nullptr, "GetSdCardRemovedEvent"},
        {52, D<&IApplicationManagerInterface::GetGameCardUpdateDetectionEvent>, "GetGameCardUpdateDetectionEvent"},
@@ -751,12 +751,8 @@ Result IApplicationManagerInterface::GetSdCardMountStatusChangedEvent(
    R_SUCCEED();
 }

-Result IApplicationManagerInterface::GetTotalSpaceSize(Out<s64> out_total_space_size, FileSys::StorageId storage_id) {
-    LOG_DEBUG(Service_NS, "called");
-    R_RETURN(IContentManagementInterface(system).GetTotalSpaceSize(out_total_space_size, storage_id));
-}
-
-Result IApplicationManagerInterface::GetFreeSpaceSize(Out<s64> out_free_space_size, FileSys::StorageId storage_id) {
+Result IApplicationManagerInterface::GetFreeSpaceSize(Out<s64> out_free_space_size,
+                                                      FileSys::StorageId storage_id) {
    LOG_DEBUG(Service_NS, "called");
    R_RETURN(IContentManagementInterface(system).GetFreeSpaceSize(out_free_space_size, storage_id));
 }
@@ -50,7 +50,6 @@ public:
        u32 flags, u64 application_id, Uid account_id);
    Result CheckSdCardMountStatus();
    Result GetSdCardMountStatusChangedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
-    Result GetTotalSpaceSize(Out<s64> out_total_space_size, FileSys::StorageId storage_id);
    Result GetFreeSpaceSize(Out<s64> out_free_space_size, FileSys::StorageId storage_id);
    Result GetGameCardUpdateDetectionEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
    Result ResumeAll();
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -21,6 +21,7 @@
 #include "core/file_sys/system_archive/system_archive.h"
 #include "core/hle/kernel/k_shared_memory.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/physical_memory.h"
 #include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/ns/platform_service_manager.h"
@@ -176,9 +176,11 @@ struct ProcessContext {
        // Calculate hash.
        Sha256Hash hash;
        {
-            const u64 size = nro_header->m_size;
+            const u64 size = nro_header->GetSize();
+
            std::vector<u8> nro_data(size);
            m_process->GetMemory().ReadBlock(base_address, nro_data.data(), size);
+
            u32 hash_len = 0;
            EVP_Digest(nro_data.data(), nro_data.size(), hash.data(), &hash_len, EVP_sha256(), nullptr);
        }
@@ -202,7 +204,9 @@ struct ProcessContext {
        R_THROW(RO::ResultNotAuthorized);
    }

-    Result ValidateNro(ModuleId* out_module_id, u64* out_rx_size, u64* out_ro_size, u64* out_rw_size, u64 base_address, u64 expected_nro_size, u64 expected_bss_size) {
+    Result ValidateNro(ModuleId* out_module_id, u64* out_rx_size, u64* out_ro_size,
+                       u64* out_rw_size, u64 base_address, u64 expected_nro_size,
+                       u64 expected_bss_size) {
        // Ensure we have a process to work on.
        R_UNLESS(m_process != nullptr, RO::ResultInvalidProcess);

@@ -211,17 +215,17 @@ struct ProcessContext {
        m_process->GetMemory().ReadBlock(base_address, std::addressof(header), sizeof(header));

        // Validate header.
-        R_UNLESS(header.m_magic == NRO_HEADER_MAGIC, RO::ResultInvalidNro);
+        R_UNLESS(header.IsMagicValid(), RO::ResultInvalidNro);

        // Read sizes from header.
-        const u64 nro_size = header.m_size;
-        const u64 text_ofs = header.m_text_offset;
-        const u64 text_size = header.m_text_size;
-        const u64 ro_ofs = header.m_ro_offset;
-        const u64 ro_size = header.m_ro_size;
-        const u64 rw_ofs = header.m_rw_offset;
-        const u64 rw_size = header.m_rw_size;
-        const u64 bss_size = header.m_bss_size;
+        const u64 nro_size = header.GetSize();
+        const u64 text_ofs = header.GetTextOffset();
+        const u64 text_size = header.GetTextSize();
+        const u64 ro_ofs = header.GetRoOffset();
+        const u64 ro_size = header.GetRoSize();
+        const u64 rw_ofs = header.GetRwOffset();
+        const u64 rw_size = header.GetRwSize();
+        const u64 bss_size = header.GetBssSize();

        // Validate sizes meet expected.
        R_UNLESS(nro_size == expected_nro_size, RO::ResultInvalidNro);
@@ -247,7 +251,7 @@ struct ProcessContext {
        R_TRY(this->ValidateHasNroHash(base_address, std::addressof(header)));

        // Check if NRO has already been loaded.
-        const ModuleId* module_id = std::addressof(header.m_module_id);
+        const ModuleId* module_id = header.GetModuleId();
        R_UNLESS(R_FAILED(this->GetNroInfoByModuleId(nullptr, module_id)), RO::ResultAlreadyLoaded);

        // Apply patches to NRO.
@@ -1,6 +1,3 @@
-// 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

@@ -115,8 +112,52 @@ private:
 };
 static_assert(sizeof(NrrHeader) == 0x350, "NrrHeader has wrong size");

-static constexpr u32 NRO_HEADER_MAGIC = Common::MakeMagic('N', 'R', 'O', '0');
-struct NroHeader {
+class NroHeader {
+public:
+    static constexpr u32 Magic = Common::MakeMagic('N', 'R', 'O', '0');
+
+public:
+    bool IsMagicValid() const {
+        return m_magic == Magic;
+    }
+
+    u32 GetSize() const {
+        return m_size;
+    }
+
+    u32 GetTextOffset() const {
+        return m_text_offset;
+    }
+
+    u32 GetTextSize() const {
+        return m_text_size;
+    }
+
+    u32 GetRoOffset() const {
+        return m_ro_offset;
+    }
+
+    u32 GetRoSize() const {
+        return m_ro_size;
+    }
+
+    u32 GetRwOffset() const {
+        return m_rw_offset;
+    }
+
+    u32 GetRwSize() const {
+        return m_rw_size;
+    }
+
+    u32 GetBssSize() const {
+        return m_bss_size;
+    }
+
+    const ModuleId* GetModuleId() const {
+        return std::addressof(m_module_id);
+    }
+
+private:
    u32 m_entrypoint_insn;
    u32 m_mod_offset;
    INSERT_PADDING_BYTES_NOINIT(0x8);
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
@@ -75,16 +75,21 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process,
                        kip->GetKernelCapabilities());

    Kernel::CodeSet codeset;
-    codeset.memory.resize(PageAlignSize(kip->GetBSSOffset()) + kip->GetBSSSize());
-    const auto load_segment = [&codeset](Kernel::CodeSet::Segment& segment, std::span<const u8> data, u32 offset) {
+    Kernel::PhysicalMemory program_image;
+
+    const auto load_segment = [&program_image](Kernel::CodeSet::Segment& segment, const std::vector<u8>& data, u32 offset) {
        segment.addr = offset;
        segment.offset = offset;
        segment.size = PageAlignSize(u32(data.size()));
-        std::memcpy(codeset.memory.data() + offset, data.data(), data.size());
+        program_image.resize(offset + data.size());
+        std::memcpy(program_image.data() + offset, data.data(), data.size());
    };
+
    load_segment(codeset.CodeSegment(), kip->GetTextSection(), kip->GetTextOffset());
    load_segment(codeset.RODataSegment(), kip->GetRODataSection(), kip->GetRODataOffset());
    load_segment(codeset.DataSegment(), kip->GetDataSection(), kip->GetDataOffset());
+
+    program_image.resize(PageAlignSize(kip->GetBSSOffset()) + kip->GetBSSSize());
    codeset.DataSegment().size += kip->GetBSSSize();

    // TODO: this is bad form of ASLR, it sucks
@@ -93,9 +98,13 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process,
        : std::rand()) * 0x734287f27) & 0xfff000;

    // Setup the process code layout
-    if (process.LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), codeset.memory.size(), 0, aslr_offset, false).IsError()) {
+    if (process
+            .LoadFromMetadata(FileSys::ProgramMetadata::GetDefault(), program_image.size(), 0, aslr_offset, false)
+            .IsError()) {
        return {ResultStatus::ErrorNotInitialized, {}};
    }
+
+    codeset.memory = std::move(program_image);
    const VAddr base_address = GetInteger(process.GetEntryPoint());
    process.LoadModule(std::move(codeset), base_address);

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -160,7 +160,7 @@ static bool LoadNroImpl(Core::System& system, Kernel::KProcess& process,
    }

    // Build program image
-    std::vector<u8> program_image(PageAlignSize(nro_header.file_size));
+    Kernel::PhysicalMemory program_image(PageAlignSize(nro_header.file_size));
    std::memcpy(program_image.data(), data.data(), program_image.size());
    if (program_image.size() != PageAlignSize(nro_header.file_size)) {
        return {};
@@ -4,7 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <algorithm>
 #include <cinttypes>
 #include <cstring>
 #include <vector>
@@ -41,6 +40,17 @@ struct MODHeader {
 };
 static_assert(sizeof(MODHeader) == 0x1c, "MODHeader has incorrect size.");

+std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
+                                  const NSOSegmentHeader& header) {
+    std::vector<u8> uncompressed_data =
+        Common::Compression::DecompressDataLZ4(compressed_data, header.size);
+
+    ASSERT_MSG(uncompressed_data.size() == header.size, "{} != {}", header.size,
+               uncompressed_data.size());
+
+    return uncompressed_data;
+}
+
 constexpr u32 PageAlignSize(u32 size) {
    return static_cast<u32>((size + Core::Memory::YUZU_PAGEMASK) & ~Core::Memory::YUZU_PAGEMASK);
 }
@@ -66,16 +76,24 @@ FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& in_file) {
    return FileType::NSO;
 }

-std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::System& system, const FileSys::VfsFile& nso_file, VAddr load_base, bool should_pass_arguments, bool load_into_process, std::optional<FileSys::PatchManager> pm, std::vector<Core::NCE::Patcher>* patches, s32 patch_index) {
-    if (nso_file.GetSize() < sizeof(NSOHeader))
+std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::System& system,
+                                               const FileSys::VfsFile& nso_file, VAddr load_base,
+                                               bool should_pass_arguments, bool load_into_process,
+                                               std::optional<FileSys::PatchManager> pm,
+                                               std::vector<Core::NCE::Patcher>* patches,
+                                               s32 patch_index) {
+    if (nso_file.GetSize() < sizeof(NSOHeader)) {
        return std::nullopt;
+    }
+
    NSOHeader nso_header{};
-    if (sizeof(NSOHeader) != nso_file.ReadObject(&nso_header))
+    if (sizeof(NSOHeader) != nso_file.ReadObject(&nso_header)) {
        return std::nullopt;
-    if (nso_header.magic != Common::MakeMagic('N', 'S', 'O', '0'))
-        return std::nullopt;
-    if (nso_header.segments.empty())
+    }
+
+    if (nso_header.magic != Common::MakeMagic('N', 'S', 'O', '0')) {
        return std::nullopt;
+    }

    // Allocate some space at the beginning if we are patching in PreText mode.
    const size_t module_start = [&]() -> size_t {
@@ -92,44 +110,42 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
        return 0;
    }();

-    auto const last_segment_it = &nso_header.segments[nso_header.segments.size() - 1];
-    // Build program image directly in codeset memory :)
+    // Build program image
    Kernel::CodeSet codeset;
-    codeset.memory.resize(module_start + last_segment_it->location + last_segment_it->size);
-    {
-        std::vector<u8> compressed_data(*std::ranges::max_element(nso_header.segments_compressed_size));
-        std::vector<u8> decompressed_size(std::ranges::max_element(nso_header.segments, [](auto const& a, auto const& b) {
-            return a.size < b.size;
-        })->size);
-        for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
-            nso_file.Read(compressed_data.data(), nso_header.segments_compressed_size[i], nso_header.segments[i].offset);
-            if (nso_header.IsSegmentCompressed(i)) {
-                int r = Common::Compression::DecompressDataLZ4(decompressed_size.data(), nso_header.segments[i].size, compressed_data.data(), nso_header.segments_compressed_size[i]);
-                ASSERT(r == int(nso_header.segments[i].size));
-                std::memcpy(codeset.memory.data() + module_start + nso_header.segments[i].location, decompressed_size.data(), nso_header.segments[i].size);
-            } else {
-                std::memcpy(codeset.memory.data() + module_start + nso_header.segments[i].location, compressed_data.data(), nso_header.segments[i].size);
-            }
-            codeset.segments[i].addr = module_start + nso_header.segments[i].location;
-            codeset.segments[i].offset = module_start + nso_header.segments[i].location;
-            codeset.segments[i].size = nso_header.segments[i].size;
+    Kernel::PhysicalMemory program_image;
+    for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
+        std::vector<u8> data = nso_file.ReadBytes(nso_header.segments_compressed_size[i],
+                                                  nso_header.segments[i].offset);
+        if (nso_header.IsSegmentCompressed(i)) {
+            data = DecompressSegment(data, nso_header.segments[i]);
        }
+        program_image.resize(module_start + nso_header.segments[i].location +
+                             static_cast<u32>(data.size()));
+        std::memcpy(program_image.data() + module_start + nso_header.segments[i].location,
+                    data.data(), data.size());
+        codeset.segments[i].addr = module_start + nso_header.segments[i].location;
+        codeset.segments[i].offset = module_start + nso_header.segments[i].location;
+        codeset.segments[i].size = nso_header.segments[i].size;
    }

    if (should_pass_arguments && !Settings::values.program_args.GetValue().empty()) {
        const auto arg_data{Settings::values.program_args.GetValue()};

        codeset.DataSegment().size += NSO_ARGUMENT_DATA_ALLOCATION_SIZE;
-        NSOArgumentHeader args_header{NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}};
-        const auto end_offset = codeset.memory.size();
-        codeset.memory.resize(u32(codeset.memory.size()) + NSO_ARGUMENT_DATA_ALLOCATION_SIZE);
-        std::memcpy(codeset.memory.data() + end_offset, &args_header, sizeof(NSOArgumentHeader));
-        std::memcpy(codeset.memory.data() + end_offset + sizeof(NSOArgumentHeader), arg_data.data(), arg_data.size());
+        NSOArgumentHeader args_header{
+            NSO_ARGUMENT_DATA_ALLOCATION_SIZE, static_cast<u32_le>(arg_data.size()), {}};
+        const auto end_offset = program_image.size();
+        program_image.resize(static_cast<u32>(program_image.size()) +
+                             NSO_ARGUMENT_DATA_ALLOCATION_SIZE);
+        std::memcpy(program_image.data() + end_offset, &args_header, sizeof(NSOArgumentHeader));
+        std::memcpy(program_image.data() + end_offset + sizeof(NSOArgumentHeader), arg_data.data(),
+                    arg_data.size());
    }

    codeset.DataSegment().size += nso_header.segments[2].bss_size;
-    u32 image_size = PageAlignSize(u32(codeset.memory.size()) + nso_header.segments[2].bss_size);
-    codeset.memory.resize(image_size);
+    u32 image_size{
+        PageAlignSize(static_cast<u32>(program_image.size()) + nso_header.segments[2].bss_size)};
+    program_image.resize(image_size);

    for (std::size_t i = 0; i < nso_header.segments.size(); ++i) {
        codeset.segments[i].size = PageAlignSize(codeset.segments[i].size);
@@ -138,7 +154,8 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
    // Apply patches if necessary
    const auto name = nso_file.GetName();
    if (pm && (pm->HasNSOPatch(nso_header.build_id, name) || Settings::values.dump_nso)) {
-        std::span<u8> patchable_section(codeset.memory.data() + module_start, codeset.memory.size() - module_start);
+        std::span<u8> patchable_section(program_image.data() + module_start,
+                                        program_image.size() - module_start);
        std::vector<u8> pi_header(sizeof(NSOHeader) + patchable_section.size());
        std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader));
        std::memcpy(pi_header.data() + sizeof(NSOHeader), patchable_section.data(),
@@ -157,15 +174,15 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
        //Set module ID using build_id from the NSO header
        patch->SetModuleID(nso_header.build_id);
        // Patch SVCs and MRS calls in the guest code
-        while (!patch->PatchText(codeset.memory, code)) {
+        while (!patch->PatchText(program_image, code)) {
            patch = &patches->emplace_back();
            patch->SetModuleID(nso_header.build_id);  // In case the patcher is changed for big modules, the new patcher should also have the build_id
        }
    } else if (patch) {
-        // Relocate code patch and copy to the program image.
+        // Relocate code patch and copy to the program_image.
        // Save size before RelocateAndCopy (which may resize)
-        const size_t size_before_relocate = codeset.memory.size();
-        if (patch->RelocateAndCopy(load_base, code, codeset.memory, &process.GetPostHandlers())) {
+        const size_t size_before_relocate = program_image.size();
+        if (patch->RelocateAndCopy(load_base, code, program_image, &process.GetPostHandlers())) {
            // Update patch section.
            auto& patch_segment = codeset.PatchSegment();
            auto& post_patch_segment = codeset.PostPatchSegment();
@@ -186,7 +203,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
        }

        // Refresh image_size to take account the patch section if it was added by RelocateAndCopy
-        image_size = static_cast<u32>(codeset.memory.size());
+        image_size = static_cast<u32>(program_image.size());
    }
 #endif

@@ -217,7 +234,9 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
    }

    // Load codeset for current process
+    codeset.memory = std::move(program_image);
    process.LoadModule(std::move(codeset), load_base);
+
    return load_base + image_size;
 }

@@ -304,7 +304,7 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo
    Optimization::GlobalMemoryToStorageBufferPass(program, host_info);
    Optimization::TexturePass(env, program, host_info);

-    if (Settings::values.resolution_info.active || Optimization::FragmentShaderNeedsRescalingPass(program)) {
+    if (Settings::values.resolution_info.active) {
        Optimization::RescalingPass(program);
    }
    Optimization::DeadCodeEliminationPass(program);
@@ -1,6 +1,3 @@
-// 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

@@ -25,7 +22,6 @@ void LowerFp64ToFp32(IR::Program& program);
 void LowerFp16ToFp32(IR::Program& program);
 void LowerInt64ToInt32(IR::Program& program);
 void RescalingPass(IR::Program& program);
-bool FragmentShaderNeedsRescalingPass(const IR::Program& program);
 void SsaRewritePass(IR::Program& program);
 void PositionPass(Environment& env, IR::Program& program);
 void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo& host_info);
@@ -32,7 +32,7 @@ namespace {
    return false;
 }

-void VisitMark(IR::Block& block, IR::Inst& inst, bool needs_hack) {
+void VisitMark(IR::Block& block, IR::Inst& inst) {
    switch (inst.GetOpcode()) {
    case IR::Opcode::ShuffleIndex:
    case IR::Opcode::ShuffleUp:
@@ -54,27 +54,24 @@ void VisitMark(IR::Block& block, IR::Inst& inst, bool needs_hack) {
        bool must_patch_outside = false;
        if (bitcast_inst->GetOpcode() == IR::Opcode::GetAttribute) {
            const IR::Attribute attr{bitcast_inst->Arg(0).Attribute()};
-            if (attr >= IR::Attribute::PositionX && attr <= IR::Attribute::PositionW) {
+            switch (attr) {
+            case IR::Attribute::PositionX:
+            case IR::Attribute::PositionY:
                bitcast_inst->SetFlags<u32>(0xDEADBEEF);
                must_patch_outside = true;
+                break;
+            default:
+                break;
            }
        }
        if (must_patch_outside) {
            const auto it{IR::Block::InstructionList::s_iterator_to(inst)};
            IR::IREmitter ir{block, it};
-
-            if (needs_hack) {
-                const IR::F32 new_inst{&*block.PrependNewInst(it, inst)};
-                const IR::F32 up_factor{ir.FPRecip(ir.ResolutionDownFactor())};
-                const IR::Value converted{ir.FPMul(new_inst, up_factor)};
-                inst.ReplaceUsesWith(converted);
-            } else {
-                IR::Inst* const new_inst{&*block.PrependNewInst(it, inst)};
-                const IR::F32 new_bitcast{ir.ConvertUToF(32, 32, IR::Value{new_inst})};
-                const IR::F32 up_factor{ir.FPRecip(ir.ResolutionDownFactor())};
-                const IR::Value converted{ir.FPMul(new_bitcast, up_factor)};
-                inst.ReplaceUsesWith(converted);
-            }
+            IR::Inst* const new_inst{&*block.PrependNewInst(it, inst)};
+            const IR::F32 new_bitcast{ir.ConvertUToF(32, 32, IR::Value{new_inst})};
+            const IR::F32 up_factor{ir.FPRecip(ir.ResolutionDownFactor())};
+            const IR::Value converted{ir.FPMul(new_bitcast, up_factor)};
+            inst.ReplaceUsesWith(converted);
        }
        break;
    }
@@ -343,49 +340,12 @@ void Visit(const IR::Program& program, IR::Block& block, IR::Inst& inst) {
 }
 } // Anonymous namespace

-bool FragmentShaderNeedsRescalingPass(const IR::Program& program) {
-#ifdef __ANDROID__
-    // Disable this workaround on Android to preserve performance
-    return false;
-#endif
-
-    if (program.stage != Stage::Fragment) return false;
-
-    for (const IR::Block* block : program.post_order_blocks) {
-        for (const IR::Inst& inst : block->Instructions()) {
-            const auto op = inst.GetOpcode();
-            if (op != IR::Opcode::ShuffleIndex && op != IR::Opcode::ShuffleUp &&
-                op != IR::Opcode::ShuffleDown && op != IR::Opcode::ShuffleButterfly) {
-                continue;
-            }
-
-            if (inst.Arg(0).IsImmediate()) continue;
-            const IR::Inst* arg_inst = inst.Arg(0).InstRecursive();
-
-            if (arg_inst->GetOpcode() != IR::Opcode::BitCastU32F32 || arg_inst->Arg(0).IsImmediate()) continue;
-            const IR::Inst* bitcast_inst = arg_inst->Arg(0).InstRecursive();
-
-            if (bitcast_inst->GetOpcode() == IR::Opcode::GetAttribute) {
-                const auto attr = bitcast_inst->Arg(0).Attribute();
-                if (attr >= IR::Attribute::PositionX && attr <= IR::Attribute::PositionW) {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
 void RescalingPass(IR::Program& program) {
    const bool is_fragment_shader{program.stage == Stage::Fragment};
-    const bool needs_hack{FragmentShaderNeedsRescalingPass(program)};
-    if (needs_hack) {
-        LOG_WARNING(Shader, "F32/U32 bitcast detected. Applying rescaling workaround.");
-    }
    if (is_fragment_shader) {
        for (IR::Block* const block : program.post_order_blocks) {
            for (IR::Inst& inst : block->Instructions()) {
-                VisitMark(*block, inst, needs_hack);
+                VisitMark(*block, inst);
            }
        }
    }
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -6,7 +6,6 @@

 #include "common/assert.h"
 #include <ranges>
-#include <vulkan/vulkan_core.h>
 #include "video_core/renderer_vulkan/present/util.h"

 namespace Vulkan {
@@ -630,8 +629,8 @@ vk::Sampler CreateCubicSampler(const Device& device, VkCubicFilterWeightsQCOM qc
        .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
        .pNext = nullptr,
        .flags = 0,
-        .magFilter = device.IsExtFilterCubicSupported() ? VK_FILTER_CUBIC_EXT : VK_FILTER_LINEAR,
-        .minFilter = device.IsExtFilterCubicSupported() ? VK_FILTER_CUBIC_EXT : VK_FILTER_LINEAR,
+        .magFilter = VK_FILTER_CUBIC_EXT,
+        .minFilter = VK_FILTER_CUBIC_EXT,
        .mipmapMode = VK_SAMPLER_MIPMAP_MODE_NEAREST,
        .addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
        .addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 Torzu Emulator Project
@@ -22,8 +22,7 @@ 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}, image_index{0},
+      present_manager{present_manager_}, scheduler{scheduler_}, filters{filters_}, image_count{1},
      swapchain_view_format{VK_FORMAT_B8G8R8A8_UNORM} {}

 BlitScreen::~BlitScreen() = default;
@@ -88,49 +87,57 @@ 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;
    }

-    if (image_count != current_swapchain_image_count) {
+    // 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) {
        resource_update_required = true;
-        image_count = current_swapchain_image_count;
    }

-    if (swapchain_view_format != current_swapchain_view_format ||
+    // 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 ||
        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(),
    };

-    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);
-        }
+    while (layers.size() < framebuffers.size()) {
+        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;
    }
@@ -139,20 +146,16 @@ void BlitScreen::DrawToFrame(RasterizerVulkan& rasterizer, Frame* frame,
 vk::Framebuffer BlitScreen::CreateFramebuffer(const Layout::FramebufferLayout& layout,
                                              VkImageView image_view,
                                              VkFormat current_view_format) {
-    bool format_updated = swapchain_view_format != current_view_format;
-    swapchain_view_format = current_view_format;
-
+    const bool format_updated =
+        std::exchange(swapchain_view_format, current_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());
 }

@@ -121,8 +121,10 @@ VkResult MasterSemaphore::SubmitQueue(vk::CommandBuffer& cmdbuf, vk::CommandBuff
    }
 }

-static constexpr VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
-                                                        VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
+static constexpr std::array<VkPipelineStageFlags, 2> wait_stage_masks{
+    VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+    VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+};

 VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf,
                                              vk::CommandBuffer& upload_cmdbuf,
@@ -141,7 +143,7 @@ VkResult MasterSemaphore::SubmitQueueTimeline(vk::CommandBuffer& cmdbuf,
    const VkSemaphore* p_wait_sems =
        (num_wait_semaphores > 0) ? &wait_semaphore : nullptr;
    const VkPipelineStageFlags* p_wait_masks =
-        (num_wait_semaphores > 0) ? &wait_stage_mask : nullptr;
+        (num_wait_semaphores > 0) ? wait_stage_masks.data() : nullptr;
    const VkSemaphore* p_signal_sems =
        (num_signal_semaphores > 0) ? signal_semaphores.data() : nullptr;
    const u64 wait_zero = 0; // dummy for binary wait
@@ -178,7 +180,7 @@ VkResult MasterSemaphore::SubmitQueueFence(vk::CommandBuffer& cmdbuf,
    const VkSemaphore* p_wait_sems =
            (num_wait_semaphores > 0) ? &wait_semaphore : nullptr;
    const VkPipelineStageFlags* p_wait_masks =
-        (num_wait_semaphores > 0) ? &wait_stage_mask : nullptr;
+        (num_wait_semaphores > 0) ? wait_stage_masks.data() : nullptr;
    const VkSemaphore* p_signal_sems =
        (num_signal_semaphores > 0) ? &signal_semaphore : nullptr;
    const std::array cmdbuffers{*upload_cmdbuf, *cmdbuf};
@@ -270,8 +270,8 @@ u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_se
            .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
            .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
        };
-        upload_cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |
-                                      VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, WRITE_BARRIER);
+        upload_cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                      VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);
        upload_cmdbuf.End();
        cmdbuf.End();

@@ -372,9 +372,15 @@ void Scheduler::EndRenderPass()
                };
            }
            cmdbuf.EndRenderPass();
-            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-                                   VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
-                                   VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, nullptr, nullptr, vk::Span(barriers.data(), num_images));
+            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
+                                   VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
+                                   VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                   VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+                                   0,
+                                   nullptr,
+                                   nullptr,
+                                   vk::Span(barriers.data(), num_images)  // Batched image barriers
+            );
        });

        state.renderpass = nullptr;
@@ -16,8 +16,8 @@

 #include "common/alignment.h"
 #include "common/common_types.h"
-#include "common/polyfill_thread.h"
 #include "common/settings.h"
+#include "common/polyfill_thread.h"
 #include "video_core/renderer_vulkan/vk_master_semaphore.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"

@@ -114,36 +114,29 @@ public:

    /// Waits for the given GPU tick, optionally pacing frames.
    void Wait(u64 tick, double target_fps = 0.0) {
+        if (Settings::values.use_speed_limit.GetValue() && target_fps > 0.0) {
+            const auto now = std::chrono::steady_clock::now();
+            if (start_time == std::chrono::steady_clock::time_point{} || current_target_fps != target_fps) {
+                start_time = now;
+                frame_counter = 0;
+                current_target_fps = target_fps;
+            }
+            frame_counter++;
+            std::chrono::duration<double> frame_interval(1.0 / current_target_fps);
+            auto target_time = start_time + frame_interval * frame_counter;
+            if (target_time > now) {
+                std::this_thread::sleep_until(target_time);
+            } else {
+                start_time = now;
+                frame_counter = 0;
+            }
+        }
        if (tick > 0) {
            if (tick >= master_semaphore->CurrentTick()) {
                Flush();
            }
            master_semaphore->Wait(tick);
        }
-        if (Settings::values.use_speed_limit.GetValue() && target_fps > 0.0) {
-            auto now = std::chrono::steady_clock::now();
-            if (last_target_fps != target_fps) {
-                frame_interval = std::chrono::duration_cast<std::chrono::steady_clock::duration>(std::chrono::duration<double>(1.0 / target_fps));
-                max_frame_count = static_cast<int>(0.1 * target_fps);
-                last_target_fps = target_fps;
-                frame_counter = 0;
-                start_time = now;
-            }
-            frame_counter++;
-            auto target_time = start_time + frame_interval * frame_counter;
-            if (target_time >= now) {
-                auto sleep_time = target_time - now;
-                if (sleep_time > std::chrono::milliseconds(15)) {
-                    std::this_thread::sleep_for(sleep_time - std::chrono::milliseconds(1));
-                }
-                while (std::chrono::steady_clock::now() < target_time) {
-                    std::this_thread::yield();
-                }
-            } else if (frame_counter > max_frame_count) {
-                frame_counter = 0;
-                start_time = now;
-            }
-        }
    }

    /// Returns the master timeline semaphore.
@@ -288,11 +281,9 @@ private:
    std::condition_variable_any event_cv;
    std::jthread worker_thread;

-    std::chrono::steady_clock::duration frame_interval{};
    std::chrono::steady_clock::time_point start_time{};
-    double last_target_fps{};
-    u64 max_frame_count{};
    u64 frame_counter{};
+    double current_target_fps{};
 };

 } // namespace Vulkan
@@ -2500,7 +2500,7 @@ void TextureCacheRuntime::TransitionImageLayout(Image& image) {
        };
        scheduler.RequestOutsideRenderPassOperationContext();
        scheduler.Record([barrier](vk::CommandBuffer cmdbuf) {
-            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
                                   VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, barrier);
        });
    }
@@ -432,7 +432,10 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
    const bool is_intel_anv = driver_id == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA;

    const bool is_nvidia = driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY;
+
    const bool is_mvk = driver_id == VK_DRIVER_ID_MOLTENVK;
+    const bool is_kosmic_krisp = driver_id == VK_DRIVER_ID_KOSMICKRISP;
+
    const bool is_qualcomm = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY;
    const bool is_turnip = driver_id == VK_DRIVER_ID_MESA_TURNIP;

@@ -557,12 +560,20 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
    }

    if (is_nvidia) {
+        const u32 nv_major_version = (properties.properties.driverVersion >> 22) & 0x3ff;
        const auto arch = GetNvidiaArch();
        if (arch >= NvidiaArchitecture::Arch_AmpereOrNewer) {
            LOG_WARNING(Render_Vulkan, "Ampere and newer have broken float16 math");
            features.shader_float16_int8.shaderFloat16 = false;
        }

+        if (nv_major_version >= 510) {
+            LOG_WARNING(Render_Vulkan,
+                        "NVIDIA Drivers >= 510 do not support MSAA->MSAA image blits. "
+                        "MSAA scaling will use 3D helpers. MSAA resolves work normally.");
+            cant_blit_msaa = true;
+        }
+
        // Mali/ NVIDIA proprietary drivers: Shader stencil export not supported
        // Use hardware depth/stencil blits instead when available
        if (!extensions.shader_stencil_export) {
@@ -650,6 +661,11 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
        properties.properties.limits.maxVertexInputBindings = 32;
    }

+    if (is_kosmic_krisp) {
+        LOG_WARNING(Render_Vulkan, "KosmicKrisp do not support MSAA->MSAA image blits. MSAA scaling will use 3D helpers. MSAA resolves work normally.");
+        cant_blit_msaa = true;
+    }
+
    const auto dyna_state = Settings::values.dyna_state.GetValue();

    // Base dynamic states (VIEWPORT, SCISSOR, DEPTH_BIAS, etc.) are ALWAYS active in vk_graphics_pipeline.cpp
@@ -107,7 +107,6 @@ VK_DEFINE_HANDLE(VmaAllocator)
    EXTENSION(NV, VIEWPORT_SWIZZLE, viewport_swizzle)                                              \
    EXTENSION(EXT, DESCRIPTOR_INDEXING, descriptor_indexing)                                       \
    EXTENSION(EXT, FILTER_CUBIC, filter_cubic)                                                     \
-    EXTENSION(IMG, FILTER_CUBIC, filter_cubic_img)                                                 \
    EXTENSION(QCOM, FILTER_CUBIC_WEIGHTS, filter_cubic_weights)

 // Define extensions which must be supported.
@@ -928,6 +927,10 @@ public:
        return properties.driver.driverID == VK_DRIVER_ID_MOLTENVK;
    }

+    bool IsKosmicKrisp() const noexcept {
+        return properties.driver.driverID == VK_DRIVER_ID_KOSMICKRISP;
+    }
+
    NvidiaArchitecture GetNvidiaArch() const noexcept {
        return nvidia_arch;
    }
@@ -412,10 +412,10 @@ if (ENABLE_WEB_SERVICE)
    target_compile_definitions(yuzu PRIVATE ENABLE_WEB_SERVICE)
 endif()

-if (YUZU_USE_QT_MULTIMEDIA)
-    target_link_libraries(yuzu PRIVATE Qt6::Multimedia)
-    target_compile_definitions(yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA)
-endif ()
+# if (YUZU_USE_QT_MULTIMEDIA)
+#     target_link_libraries(yuzu PRIVATE Qt6::Multimedia)
+#     target_compile_definitions(yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA)
+# endif ()

 if (YUZU_USE_QT_WEB_ENGINE)
    target_link_libraries(yuzu PRIVATE Qt6::WebEngineCore Qt6::WebEngineWidgets)
@@ -13,11 +13,10 @@
 #include <QtCore/qglobal.h>
 #include "common/settings_enums.h"
 #include "qt_common/config/uisettings.h"
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
 #include <QCamera>
-#include <QImageCapture>
-#include <QMediaCaptureSession>
-#include <QMediaDevices>
+#include <QCameraImageCapture>
+#include <QCameraInfo>
 #endif
 #include <QCursor>
 #include <QEvent>
@@ -757,25 +756,24 @@ void GRenderWindow::TouchEndEvent() {
 }

 void GRenderWindow::InitializeCamera() {
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    constexpr auto camera_update_ms = std::chrono::milliseconds{50}; // (50ms, 20Hz)
    if (!Settings::values.enable_ir_sensor) {
        return;
    }

    bool camera_found = false;
-    std::string current_device = Settings::values.ir_sensor_device.GetValue();
-#ifdef _WIN32
-    std::replace(current_device.begin(), current_device.end(), '|', '\\');
-#endif
-    const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice& cameraDevice : cameras) {
-        if (current_device == cameraDevice.id().toStdString() || current_device == "auto") {
-            if (cameraDevice.videoFormats().isEmpty()) {
-                LOG_ERROR(Frontend, "Camera doesn't provide any video formats.");
+    const QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
+    for (const QCameraInfo& cameraInfo : cameras) {
+        if (Settings::values.ir_sensor_device.GetValue() == cameraInfo.deviceName().toStdString() ||
+            Settings::values.ir_sensor_device.GetValue() == "Auto") {
+            camera = std::make_unique<QCamera>(cameraInfo);
+            if (!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder) &&
+                !camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
+                LOG_ERROR(Frontend,
+                          "Camera doesn't support CaptureViewfinder or CaptureStillImage");
                continue;
            }
-            camera = std::make_unique<QCamera>(cameraDevice);
            camera_found = true;
            break;
        }
@@ -785,16 +783,27 @@ void GRenderWindow::InitializeCamera() {
        return;
    }

-    capture_session = std::make_unique<QMediaCaptureSession>();
-    camera_capture = std::make_unique<QImageCapture>();
-    capture_session->setCamera(camera.get());
-    capture_session->setImageCapture(camera_capture.get());
+    camera_capture = std::make_unique<QCameraImageCapture>(camera.get());
+
+    if (!camera_capture->isCaptureDestinationSupported(
+            QCameraImageCapture::CaptureDestination::CaptureToBuffer)) {
+        LOG_ERROR(Frontend, "Camera doesn't support saving to buffer");
+        return;
+    }

    const auto camera_width = input_subsystem->GetCamera()->getImageWidth();
    const auto camera_height = input_subsystem->GetCamera()->getImageHeight();
    camera_data.resize(camera_width * camera_height);
-    connect(camera_capture.get(), &QImageCapture::imageCaptured, this,
+    camera_capture->setCaptureDestination(QCameraImageCapture::CaptureDestination::CaptureToBuffer);
+    connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,
            &GRenderWindow::OnCameraCapture);
+    camera->unload();
+    if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder)) {
+        camera->setCaptureMode(QCamera::CaptureViewfinder);
+    } else if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
+        camera->setCaptureMode(QCamera::CaptureStillImage);
+    }
+    camera->load();
    camera->start();

    pending_camera_snapshots = 0;
@@ -808,18 +817,18 @@ void GRenderWindow::InitializeCamera() {
 }

 void GRenderWindow::FinalizeCamera() {
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    if (camera_timer) {
        camera_timer->stop();
    }
    if (camera) {
-        camera->stop();
+        camera->unload();
    }
 #endif
 }

 void GRenderWindow::RequestCameraCapture() {
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    if (!Settings::values.enable_ir_sensor) {
        return;
    }
@@ -840,7 +849,7 @@ void GRenderWindow::RequestCameraCapture() {
 }

 void GRenderWindow::OnCameraCapture(int requestId, const QImage& img) {
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    // TODO: Capture directly in the format and resolution needed
    const auto camera_width = input_subsystem->GetCamera()->getImageWidth();
    const auto camera_height = input_subsystem->GetCamera()->getImageHeight();
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
@@ -34,8 +34,7 @@

 class MainWindow;
 class QCamera;
-class QImageCapture;
-class QMediaCaptureSession;
+class QCameraImageCapture;
 class QCloseEvent;
 class QFocusEvent;
 class QKeyEvent;
@@ -265,13 +264,12 @@ private:
    bool first_frame = false;
    InputCommon::TasInput::TasState last_tas_state;

-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    bool is_virtual_camera;
    int pending_camera_snapshots;
    std::vector<u32> camera_data;
    std::unique_ptr<QCamera> camera;
-    std::unique_ptr<QImageCapture> camera_capture;
-    std::unique_ptr<QMediaCaptureSession> capture_session;
+    std::unique_ptr<QCameraImageCapture> camera_capture;
    std::unique_ptr<QTimer> camera_timer;
 #endif

@@ -1,16 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // Text : Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include <memory>
 #include <QtCore>
-#if YUZU_USE_QT_MULTIMEDIA
-#include <QCamera>
-#include <QImageCapture>
-#include <QMediaCaptureSession>
-#include <QMediaDevices>
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
+#include <QCameraImageCapture>
+#include <QCameraInfo>
 #endif
 #include <QStandardItemModel>
 #include <QTimer>
@@ -41,20 +36,22 @@ ConfigureCamera::ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* i
 ConfigureCamera::~ConfigureCamera() = default;

 void ConfigureCamera::PreviewCamera() {
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    const auto index = ui->ir_sensor_combo_box->currentIndex();
    bool camera_found = false;
-    const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice& cameraDevice : cameras) {
-        if (input_devices[index] == cameraDevice.id().toStdString() ||
-            input_devices[index] == "auto") {
-            LOG_INFO(Frontend, "Selected Camera {} {}", cameraDevice.description().toStdString(),
-                     cameraDevice.id().toStdString());
-            if (cameraDevice.videoFormats().isEmpty()) {
-                LOG_ERROR(Frontend, "Camera doesn't provide any video formats.");
+    const QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
+    for (const QCameraInfo& cameraInfo : cameras) {
+        if (input_devices[index] == cameraInfo.deviceName().toStdString() ||
+            input_devices[index] == "Auto") {
+            LOG_INFO(Frontend, "Selected Camera {} {}", cameraInfo.description().toStdString(),
+                     cameraInfo.deviceName().toStdString());
+            camera = std::make_unique<QCamera>(cameraInfo);
+            if (!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder) &&
+                !camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
+                LOG_ERROR(Frontend,
+                          "Camera doesn't support CaptureViewfinder or CaptureStillImage");
                continue;
            }
-            camera = std::make_unique<QCamera>(cameraDevice);
            camera_found = true;
            break;
        }
@@ -69,12 +66,24 @@ void ConfigureCamera::PreviewCamera() {
        return;
    }

-    capture_session = std::make_unique<QMediaCaptureSession>();
-    camera_capture = std::make_unique<QImageCapture>();
-    capture_session->setCamera(camera.get());
-    capture_session->setImageCapture(camera_capture.get());
-    connect(camera_capture.get(), &QImageCapture::imageCaptured, this,
+    camera_capture = std::make_unique<QCameraImageCapture>(camera.get());
+
+    if (!camera_capture->isCaptureDestinationSupported(
+            QCameraImageCapture::CaptureDestination::CaptureToBuffer)) {
+        LOG_ERROR(Frontend, "Camera doesn't support saving to buffer");
+        return;
+    }
+
+    camera_capture->setCaptureDestination(QCameraImageCapture::CaptureDestination::CaptureToBuffer);
+    connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,
            &ConfigureCamera::DisplayCapturedFrame);
+    camera->unload();
+    if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder)) {
+        camera->setCaptureMode(QCamera::CaptureViewfinder);
+    } else if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
+        camera->setCaptureMode(QCamera::CaptureStillImage);
+    }
+    camera->load();
    camera->start();

    pending_snapshots = 0;
@@ -120,31 +129,24 @@ void ConfigureCamera::RetranslateUI() {
 }

 void ConfigureCamera::ApplyConfiguration() {
-    std::string current_device = input_devices[ui->ir_sensor_combo_box->currentIndex()];
-#ifdef _WIN32
-    // for whatever reason replacing with / isn't enough so we use | for saving
-    std::replace(current_device.begin(), current_device.end(), '\\', '|');
-#endif
-    Settings::values.ir_sensor_device.SetValue(current_device);
+    const auto index = ui->ir_sensor_combo_box->currentIndex();
+    Settings::values.ir_sensor_device.SetValue(input_devices[index]);
 }

 void ConfigureCamera::LoadConfiguration() {
    input_devices.clear();
    ui->ir_sensor_combo_box->clear();
-    input_devices.push_back("auto");
+    input_devices.push_back("Auto");
    ui->ir_sensor_combo_box->addItem(tr("Auto"));
-#if YUZU_USE_QT_MULTIMEDIA
-    const auto cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice& cameraDevice : cameras) {
-        input_devices.push_back(cameraDevice.id().toStdString());
-        ui->ir_sensor_combo_box->addItem(cameraDevice.description());
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
+    const auto cameras = QCameraInfo::availableCameras();
+    for (const QCameraInfo& cameraInfo : cameras) {
+        input_devices.push_back(cameraInfo.deviceName().toStdString());
+        ui->ir_sensor_combo_box->addItem(cameraInfo.description());
    }
 #endif

-    std::string current_device = Settings::values.ir_sensor_device.GetValue();
-#ifdef _WIN32
-    std::replace(current_device.begin(), current_device.end(), '|', '\\');
-#endif
+    const auto current_device = Settings::values.ir_sensor_device.GetValue();

    const auto devices_it = std::find_if(
        input_devices.begin(), input_devices.end(),
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // Text : Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -11,8 +8,7 @@

 class QTimer;
 class QCamera;
-class QImageCapture;
-class QMediaCaptureSession;
+class QCameraImageCapture;

 namespace InputCommon {
 class InputSubsystem;
@@ -50,10 +46,9 @@ private:

    bool is_virtual_camera;
    int pending_snapshots;
-#if YUZU_USE_QT_MULTIMEDIA
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
    std::unique_ptr<QCamera> camera;
-    std::unique_ptr<QImageCapture> camera_capture;
-    std::unique_ptr<QMediaCaptureSession> capture_session;
+    std::unique_ptr<QCameraImageCapture> camera_capture;
 #endif
    std::unique_ptr<QTimer> camera_timer;
    std::vector<std::string> input_devices;
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -201,7 +201,7 @@ void ConfigureInputAdvanced::UpdateUIEnabled() {
    ui->debug_configure->setEnabled(ui->debug_enabled->isChecked());
    ui->touchscreen_advanced->setEnabled(ui->touchscreen_enabled->isChecked());
    ui->ring_controller_configure->setEnabled(ui->enable_ring_controller->isChecked());
-#if !defined(YUZU_USE_QT_MULTIMEDIA)
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) || !defined(YUZU_USE_QT_MULTIMEDIA)
    ui->enable_ir_sensor->setEnabled(false);
    ui->camera_configure->setEnabled(false);
 #endif
@@ -220,6 +220,7 @@ struct TitlebarFilter final : QObject {
            case QEvent::WinIdChange:
            case QEvent::Show:
            case QEvent::ShowToParent:
+            case QEvent::Polish:
            case QEvent::WindowStateChange:
            case QEvent::ZOrderChange:
                ApplyDarkToTopLevel(w, dark);