fixine

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -46,9 +46,6 @@ endif()
 
 cmake_dependent_option(YUZU_STATIC_ROOM "Build a static room executable only (CI only)" OFF "LINUX" OFF)
 if (YUZU_STATIC_ROOM)
-    set(YUZU_ROOM ON)
-    set(YUZU_ROOM_STANDALONE ON)
-
     # disable e v e r y t h i n g
     set(ENABLE_QT OFF)
     set(YUZU_CMD OFF)
@@ -81,9 +78,6 @@ cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSV
 option(ENABLE_DEBUG_TOOLS "Enable debugging tools (maxwell disassembler, SPIRV translator, etc)" OFF)
 option(ENABLE_WERROR "Enable -Werror diagnostics" ON)
 
-# Lossless Scaling frame generation. Only Android.
-cmake_dependent_option(ENABLE_LSFG "Enable Lossless Scaling frame generation" ON "ANDROID" OFF)
-
 # non-linux bundled qt are static
 if (YUZU_USE_BUNDLED_QT AND (APPLE OR NOT UNIX))
     set(YUZU_STATIC_BUILD ON)
@@ -260,9 +254,6 @@ option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.
 
 option(NIGHTLY_BUILD "Use Nightly qualifiers in the update checker and build metadata" OFF)
 
-cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
-cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
-
 cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "NOT ANDROID" OFF)
 
 cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)
@@ -303,10 +294,6 @@ if (ARCHITECTURE_arm64 AND (ANDROID OR LINUX))
     add_compile_definitions(HAS_NCE=1)
 endif()
 
-if (YUZU_ROOM)
-    add_compile_definitions(YUZU_ROOM)
-endif()
-
 if (UNIX AND NOT (LINUX OR WIN32))
     if(CXX_APPLE OR CXX_CLANG)
         # libc++ has stop_token and jthread as experimental
@@ -342,12 +329,11 @@ if (CXX_GCC OR CXX_CLANG)
         endif()
     elseif(ARCHITECTURE_arm64)
         # See https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
-        set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, optimized, armv9, native")
+        set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, armv9, native")
         set(mtune generic)
+
         if (${YUZU_BUILD_PRESET} STREQUAL "generic")
             set(march armv8-a)
-        elseif (${YUZU_BUILD_PRESET} STREQUAL "optimized")
-            set(march armv8.2-a+lse+rcpc)
         elseif (${YUZU_BUILD_PRESET} STREQUAL "armv9")
             set(march armv9-a)
         endif()

docs/Options.md

@@ -65,8 +65,6 @@ These options control executables and build flavors.
 **Desktop only**:
 
 - `YUZU_CMD` (ON) Compile the SDL-based 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.
 
@@ -101,5 +99,7 @@ The following options were a part of Eden at one point, but have since been reti
 - `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`.
 - `YUZU_USE_EXTERNAL_SDL` - This is now handled automatically. It was included even after CPM for purposes that have not applied for a very long time.
+- `YUZU_ROOM` - Room functionality is now built-in into eden-cli unconditionally.
+- `YUZU_ROOM_STANDALONE` - Likewise.
 
 See `src/dynarmic/CMakeLists.txt` for additional options--usually, these don't need changed

docs/user/CommandLine.md

@@ -1,32 +1,47 @@
 # User Handbook - Command Line
 
-There are two main applications, an SDL-based app (`eden-cli`) and a Qt based app (`eden`); both accept command line arguments.
+There are two main applications, an SDL-based app (`eden-cli`) and a Qt based app (`eden`); both accept command line arguments and share almost the same accepted arguments.
 
 ## eden
 
 - `./eden <path>`: Running with a single argument and nothing else, will make the emulator look for the given file and load it, this behaviour is similar to `eden-cli`; allows dragging and dropping games into the application.
-- `-g <path>`: Alternate way to specify what to load, overrides. However let it be noted that arguments that use `-` will be treated as options/ignored, if your game, for some reason, starts with `-`, in order to safely handle it you may need to specify it as an argument.
-- `-f`: Use fullscreen.
-- `-u <number>`: Select the index of the user to load as.
-- `-input-profile <name>`: Specifies input profile name to use (for player #0 only).
-- `-qlaunch`: Launch QLaunch.
-- `-hlaunch`: Launch homebrew launcher `nx-hbloader`.
+- `--hlaunch`: Launch homebrew launcher `nx-hbloader`.
     - Requires a copy of Atmosphere to be extracted onto `sdmc`.
     - This is a shorthand for `<eden folder>/sdmc/atmosphere/hbl.nsp`.
-- `-setup`: Launch setup applet.
+- `--setup`: Launch setup applet.
+- `-q/--qlaunch`: Launch QLaunch.
+- `-d/--debug`: Enter debug mode, allow gdb stub at port `1234`
+- `-c/--config`: Specify alternate configuration file.
+- `-f/--fullscreen`: Set fullscreen.
+- `-h/--help`: Display help.
+- `-g/--game`: Alternate way to specify what to load, overrides. However let it be noted that arguments that use `-` will be treated as options/ignored, if your game, for some reason, starts with `-`, in order to safely handle it you may need to specify it as an argument.
+- `-m/--multiplayer`: Specify multiplayer options.
+- `-p/--program`: Specify the program arguments to pass (optional).
+- `-u/--user`: Select the index of the user to load as.
+- `-v/--version`: Display version and quit.
+- `-i/--input-profile`: Specifies input profile name to use (for player #0 only).
+- `-n/--null-render`: Forces the usage of the "Null" render backend irrespective of settings.
+- `-x/--filter`: Sets the debug log filter irrespective of settings.
+- `-s/--singlecore`: Forces single-core regardless of settings.
+- `-l/--log-file`: The file for storing the room log.
+- `-H/--headless`: Force headless mode (no GUI). Currently only used for rooms.
 
-## eden-cli
+Room settings:
+- `-N/--name`: The name of the room.
+- `-D/--description`: The room description.
+- `-S/--bind-address`: The bind address for the room.
+- `-P/--port`: The port used for the room.
+- `-M/--max-members`: The maximum number of players for this room.
+- `-W/--password`: The password for the room.
+- `-G/--preferred-game`: The preferred game for this room.
+- `-I/--preferred-game-id`: The preferred game-id for this room.
+- `-U/--username`: The username used for announce.
+- `-T/--token`: The token used for announce.
+- `-A/--web-api-url`: yuzu Web API url.
+- `-B/--ban-list-file`: The file for storing the room ban list.
+- `-h/--help`: Display this help and exit.
+- `-v/--version`: Output version information and exit.,
 
-- `--debug/-d`: Enter debug mode, allow gdb stub at port `1234`
-- `--config/-c`: Specify alternate configuration file.
-- `--fullscreen/-f`: Set fullscreen.
-- `--help/-h`: Display help.
-- `--game/-g`: Specify the game to run.
-- `--multiplayer/-m`: Specify multiplayer options.
-- `--program/-p`: Specify the program arguments to pass (optional).
-- `--user/-u`: Specify the user index.
-- `--version/-v`: Display version and quit.
-- `--input-profile/-i`: Specifies input profile name to use (for player #0 only).
-- `--null-render/-n`: Forces the usage of the "Null" render backend irrespective of settings.
-- `--filter/-x`: Sets the debug log filter irrespective of settings.
-- `--singlecore/-s`: Forces single-core regardless of settings.
+If the name and description of the room is specified, then it will default to headless mode if not already specified.
+
+Old settings `-hlaunch`, `-qlaunch` and `-setup` are recognized independently. They're kept for backwards compatibility with shortcuts made before the change. Using one of these makes the parser immediately halt and ignore every other option.

src/CMakeLists.txt

@@ -251,15 +251,6 @@ endif()
 add_subdirectory(common)
 add_subdirectory(network)
 
-if (YUZU_ROOM)
-    add_subdirectory(dedicated_room)
-endif()
-
-if (YUZU_ROOM_STANDALONE)
-    add_subdirectory(yuzu_room_standalone)
-    set_target_properties(yuzu-room PROPERTIES OUTPUT_NAME "eden-room")
-endif()
-
 if (YUZU_STATIC_ROOM)
     return()
 endif()

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

@@ -539,40 +539,6 @@ object NativeLibrary {
      */
     external fun installKeys(path: String, ext: String): Int
 
-    /**
-     * @return Whether this GPU can run the Lossless Scaling frame generation shaders,
-     *         which are built against the Vulkan memory model.
-     */
-    external fun supportsFrameGeneration(): Boolean
-
-    /**
-     * @return Path the user-supplied Lossless Scaling library is expected at.
-     */
-    external fun getLosslessDllPath(): String
-
-    /**
-     * Parses the installed Lossless Scaling library and checks that every shader the
-     * frame generation chain needs is present.
-     *
-     * @return The result code, matching the losslessDllResults array.
-     */
-    external fun validateLosslessDll(): Int
-
-    /**
-     * Translates the frame generation shaders out of the installed Lossless Scaling library
-     * and writes them to the SPIR-V cache. Slow, so call it off the main thread.
-     *
-     * @return The result code, matching the losslessDllResults array.
-     */
-    external fun prepareLosslessDll(): Int
-
-    /**
-     * Deletes the installed Lossless Scaling library.
-     *
-     * @return Whether the library is gone after the call.
-     */
-    external fun removeLosslessDll(): Boolean
-
     /**
      * Checks the PatchManager for any addons that are available
      *

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

@@ -559,15 +559,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
     private fun enableFullscreenImmersive() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
-        @Suppress("DEPRECATION")
-        window.decorView.systemUiVisibility =
-            View.SYSTEM_UI_FLAG_FULLSCREEN or
-                View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
-                View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY or
-                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-                View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-
         WindowInsetsControllerCompat(window, window.decorView).let { controller ->
             controller.hide(WindowInsetsCompat.Type.systemBars())
             controller.systemBarsBehavior =

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

@@ -18,6 +18,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
     FIX_BLOOM_EFFECTS("fix_bloom_effects"),
     EMULATE_BGR565("emulate_bgr565"),
+    RESCALE_HACK("rescale_hack"),
     CPUOPT_UNSAFE_HOST_MMU("cpuopt_unsafe_host_mmu"),
     USE_DOCKED_MODE("use_docked_mode"),
     USE_AUTO_STUB("use_auto_stub"),
@@ -36,10 +37,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     RENDERER_PATCH_OLD_QCOM_DRIVERS("patch_old_qcom_drivers"),
     RENDERER_VERTEX_INPUT_DYNAMIC_STATE("vertex_input_dynamic_state"),
     RENDERER_SAMPLE_SHADING("sample_shading"),
-    RENDERER_FRAME_GEN("frame_gen"),
-    RENDERER_FRAME_GEN_FP16("frame_gen_fp16"),
-    RENDERER_FRAME_GEN_FLOW_SCALE_AUTO("frame_gen_flow_scale_auto"),
-    RENDERER_FRAME_GEN_DUMP_FLOW("frame_gen_dump_flow"),
     GPU_UNSWIZZLE_ENABLED("gpu_unswizzle_enabled"),
     PICTURE_IN_PICTURE("picture_in_picture"),
     USE_CUSTOM_RTC("custom_rtc_enabled"),

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

@@ -19,10 +19,6 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     RENDERER_ASTC_DECODE_METHOD("accelerate_astc"),
     RENDERER_ACCURACY("gpu_accuracy"),
     RENDERER_RESOLUTION("resolution_setup"),
-    RENDERER_FRAME_GEN_MULTIPLIER("frame_gen_multiplier"),
-    RENDERER_FRAME_GEN_TARGET_RATE("frame_gen_target_rate"),
-    RENDERER_FRAME_GEN_QUEUE_TARGET("frame_gen_queue_target"),
-    RENDERER_FRAME_GEN_FLOW_SCALE("frame_gen_flow_scale"),
     RENDERER_VSYNC("use_vsync"),
     RENDERER_SCALING_FILTER("scaling_filter"),
     RENDERER_ANTI_ALIASING("anti_aliasing"),

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

@@ -11,7 +11,6 @@ object Settings {
         SECTION_ROOT(R.string.advanced_settings),
         SECTION_SYSTEM(R.string.preferences_system),
         SECTION_RENDERER(R.string.preferences_graphics),
-        SECTION_FRAME_GEN(R.string.frame_gen),
         SECTION_PERFORMANCE_STATS(R.string.stats_overlay_options),
         SECTION_INPUT_OVERLAY(R.string.input_overlay_options),
         SECTION_SOC_OVERLAY(R.string.soc_overlay_options),

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

@@ -21,7 +21,6 @@ import org.yuzu.yuzu_emu.features.settings.model.LongSetting
 import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.network.NetDataValidators
-import org.yuzu.yuzu_emu.utils.LosslessScalingHelper
 import org.yuzu.yuzu_emu.utils.NativeConfig
 
 /**
@@ -66,19 +65,6 @@ abstract class SettingsItem(
                 return NativeLibrary.isFirmwareAvailable()
             }
 
-            if (setting.key in frameGenKeys &&
-                !(LosslessScalingHelper.isInstalled() && LosslessScalingHelper.isSupportedByGpu())
-            ) {
-                return false
-            }
-
-            // A frame rate target moves the multiplier on its own
-            if (setting.key == IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.key &&
-                frameGenTargetRate != 0
-            ) {
-                return false
-            }
-
             // Can't edit settings that aren't saveable in per-game config even if they are switchable
             if (NativeConfig.isPerGameConfigLoaded() && !setting.isSaveable) {
                 return false
@@ -102,31 +88,7 @@ abstract class SettingsItem(
     val clearable: Boolean
         get() = !setting.global && NativeConfig.isPerGameConfigLoaded()
 
-    private val frameGenTargetRate: Int
-        get() {
-            val key = IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key
-            val needsGlobal = if (NativeLibrary.isRunning() &&
-                !NativeConfig.isPerGameConfigLoaded()
-            ) {
-                !NativeConfig.usingGlobal(key)
-            } else {
-                NativeConfig.usingGlobal(key)
-            }
-            return IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.getInt(needsGlobal)
-        }
-
     companion object {
-        private val frameGenKeys = setOf(
-            BooleanSetting.RENDERER_FRAME_GEN.key,
-            IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.key,
-            IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key,
-            IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET.key,
-            BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.key,
-            IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE.key,
-            BooleanSetting.RENDERER_FRAME_GEN_FP16.key,
-            BooleanSetting.RENDERER_FRAME_GEN_DUMP_FLOW.key
-        )
-
         const val TYPE_HEADER = 0
         const val TYPE_SWITCH = 1
         const val TYPE_SINGLE_CHOICE = 2
@@ -624,7 +586,6 @@ abstract class SettingsItem(
                     IntSetting.FSR_SHARPENING_SLIDER,
                     titleId = R.string.fsr_sharpness,
                     descriptionId = R.string.fsr_sharpness_description,
-                    max = 200,
                     units = "%"
                 )
             )
@@ -646,71 +607,6 @@ abstract class SettingsItem(
                     valuesId = R.array.rendererAntiAliasingValues
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN,
-                    titleId = R.string.frame_gen,
-                    descriptionId = R.string.frame_gen_description
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_MULTIPLIER,
-                    titleId = R.string.frame_gen_multiplier,
-                    descriptionId = R.string.frame_gen_multiplier_description,
-                    choicesId = R.array.frameGenMultiplierNames,
-                    valuesId = R.array.frameGenMultiplierValues
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_TARGET_RATE,
-                    titleId = R.string.frame_gen_target_rate,
-                    descriptionId = R.string.frame_gen_target_rate_description,
-                    choicesId = R.array.frameGenTargetRateNames,
-                    valuesId = R.array.frameGenTargetRateValues
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET,
-                    titleId = R.string.frame_gen_queue_target,
-                    descriptionId = R.string.frame_gen_queue_target_description,
-                    choicesId = R.array.frameGenQueueTargetNames,
-                    valuesId = R.array.frameGenQueueTargetValues
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO,
-                    titleId = R.string.frame_gen_flow_scale_auto,
-                    descriptionId = R.string.frame_gen_flow_scale_auto_description
-                )
-            )
-            put(
-                SliderSetting(
-                    IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE,
-                    titleId = R.string.frame_gen_flow_scale,
-                    descriptionId = R.string.frame_gen_flow_scale_description,
-                    min = 25,
-                    max = 100,
-                    units = "%"
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN_FP16,
-                    titleId = R.string.frame_gen_fp16,
-                    descriptionId = R.string.frame_gen_fp16_description
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN_DUMP_FLOW,
-                    titleId = R.string.frame_gen_dump_flow,
-                    descriptionId = R.string.frame_gen_dump_flow_description
-                )
-            )
             put(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_SCREEN_LAYOUT,
@@ -877,6 +773,13 @@ abstract class SettingsItem(
                     descriptionId = R.string.fix_bloom_effects_description
                 )
             )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RESCALE_HACK,
+                    titleId = R.string.rescale_hack,
+                    descriptionId = R.string.rescale_hack_description
+                )
+            )
             put(
                 SwitchSetting(
                     BooleanSetting.EMULATE_BGR565,

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

@@ -382,9 +382,7 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                 }
                 scSetting.setSelectedValue(value)
 
-                if (scSetting.setting.key == IntSetting.RENDERER_SCALING_FILTER.key ||
-                    scSetting.setting.key == IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key
-                ) {
+                if (scSetting.setting.key == IntSetting.RENDERER_SCALING_FILTER.key) {
                     settingsViewModel.setShouldReloadSettingsList(true)
                 }
 

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

@@ -27,7 +27,6 @@ import org.yuzu.yuzu_emu.features.settings.model.ShortSetting
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.model.view.*
 import org.yuzu.yuzu_emu.utils.InputHandler
-import org.yuzu.yuzu_emu.utils.LosslessScalingHelper
 import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FullscreenHelper
@@ -77,41 +76,6 @@ class SettingsFragmentPresenter(
         }
     }
 
-    private fun addFrameGenSettings(sl: ArrayList<SettingsItem>) {
-        sl.apply {
-            if (!LosslessScalingHelper.isSupportedByGpu()) {
-                add(
-                    RunnableSetting(
-                        titleId = R.string.frame_gen_unsupported,
-                        descriptionId = R.string.frame_gen_unsupported_description,
-                        isRunnable = false
-                    ) {}
-                )
-            } else if (!LosslessScalingHelper.isInstalled()) {
-                add(
-                    RunnableSetting(
-                        titleId = R.string.lossless_scaling_missing,
-                        descriptionId = R.string.lossless_scaling_missing_description,
-                        isRunnable = false
-                    ) {}
-                )
-            }
-
-            add(BooleanSetting.RENDERER_FRAME_GEN.key)
-            add(IntSetting.RENDERER_FRAME_GEN_TARGET_RATE.key)
-            add(IntSetting.RENDERER_FRAME_GEN_MULTIPLIER.key)
-            add(IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET.key)
-            add(BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.key)
-            if (!BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.getBoolean(
-                    getNeedsGlobalForKey(BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO.key)
-                )
-            ) {
-                add(IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE.key)
-            }
-            add(BooleanSetting.RENDERER_FRAME_GEN_FP16.key)
-        }
-    }
-
     private fun isSharpnessScalingFilterSelected(): Boolean {
         val needsGlobal = getNeedsGlobalForKey(IntSetting.RENDERER_SCALING_FILTER.key)
         val selectedFilter = IntSetting.RENDERER_SCALING_FILTER.getInt(needsGlobal)
@@ -156,7 +120,6 @@ class SettingsFragmentPresenter(
             MenuTag.SECTION_ROOT -> addConfigSettings(sl)
             MenuTag.SECTION_SYSTEM -> addSystemSettings(sl)
             MenuTag.SECTION_RENDERER -> addGraphicsSettings(sl)
-            MenuTag.SECTION_FRAME_GEN -> addFrameGenSettings(sl)
             MenuTag.SECTION_PERFORMANCE_STATS -> addPerformanceOverlaySettings(sl)
             MenuTag.SECTION_SOC_OVERLAY -> addSocOverlaySettings(sl)
             MenuTag.SECTION_INPUT_OVERLAY -> addInputOverlaySettings(sl)
@@ -339,6 +302,7 @@ class SettingsFragmentPresenter(
             add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
             add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
             add(BooleanSetting.EMULATE_BGR565.key)
+            add(BooleanSetting.RESCALE_HACK.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
             add(IntSetting.ANDROID_PIPELINE_WORKERS.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key)
@@ -1332,7 +1296,6 @@ class SettingsFragmentPresenter(
                 add(BooleanSetting.DUMP_GUEST_SHADERS.key)
                 add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key)
                 add(BooleanSetting.DUMP_MACROS.key)
-                add(BooleanSetting.RENDERER_FRAME_GEN_DUMP_FLOW.key)
                 add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
                 add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
                 add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)

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

@@ -29,7 +29,6 @@ enum class SettingsSubscreen {
     DRIVER_MANAGER,
     DRIVER_FETCHER,
     FREEDRENO_SETTINGS,
-    LOSSLESS_MANAGER,
     APPLET_LAUNCHER,
     INSTALLABLE,
     GAME_FOLDERS,
@@ -127,7 +126,6 @@ class SettingsSubscreenActivity : AppCompatActivity() {
             SettingsSubscreen.DRIVER_MANAGER -> R.id.driverManagerFragment
             SettingsSubscreen.DRIVER_FETCHER -> R.id.driverFetcherFragment
             SettingsSubscreen.FREEDRENO_SETTINGS -> R.id.freedrenoSettingsFragment
-            SettingsSubscreen.LOSSLESS_MANAGER -> R.id.losslessManagerFragment
             SettingsSubscreen.APPLET_LAUNCHER -> R.id.appletLauncherFragment
             SettingsSubscreen.INSTALLABLE -> R.id.installableFragment
             SettingsSubscreen.GAME_FOLDERS -> R.id.gameFoldersFragment

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

@@ -1182,7 +1182,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                     container,
                     IntSetting.FSR_SHARPENING_SLIDER,
                     minValue = 0,
-                    maxValue = 200,
+                    maxValue = 100,
                     units = "%"
                 )
             }

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

@@ -369,21 +369,6 @@ class GamePropertiesFragment : Fragment() {
                     )
                 )
             }
-            add(
-                SubmenuProperty(
-                    R.string.frame_gen,
-                    R.string.frame_gen_per_game_description,
-                    R.drawable.ic_duck,
-                    action = {
-                        val action = HomeNavigationDirections.actionGlobalSettingsActivity(
-                            args.game,
-                            Settings.MenuTag.SECTION_FRAME_GEN
-                        )
-                        binding.root.findNavController().navigate(action)
-                    }
-                )
-            )
-
             if (GpuDriverHelper.isAdrenoGpu()) {
                 add(
                     SubmenuProperty(

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

@@ -44,7 +44,6 @@ import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.Log
-import org.yuzu.yuzu_emu.utils.LosslessScalingHelper
 import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
 
 class HomeSettingsFragment : Fragment() {
@@ -171,24 +170,6 @@ class HomeSettingsFragment : Fragment() {
                     )
                 )
             }
-            add(
-                HomeSetting(
-                    R.string.lossless_scaling,
-                    R.string.lossless_scaling_description,
-                    R.drawable.ic_duck,
-                    {
-                        val action = HomeNavigationDirections.actionGlobalSettingsSubscreenActivity(
-                            SettingsSubscreen.LOSSLESS_MANAGER,
-                            null
-                        )
-                        binding.root.findNavController().navigate(action)
-                    },
-                    { true },
-                    0,
-                    0,
-                    LosslessScalingHelper.statusText
-                )
-            )
             add(
                 HomeSetting(
                     R.string.multiplayer,
@@ -356,7 +337,6 @@ class HomeSettingsFragment : Fragment() {
     override fun onResume() {
         super.onResume()
         driverViewModel.updateDriverNameForGame(null)
-        LosslessScalingHelper.refreshStatus()
     }
 
     override fun onDestroyView() {

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

@@ -1,174 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.GridLayoutManager
-import com.google.android.material.transition.MaterialSharedAxis
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.HomeSettingAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentLosslessManagerBinding
-import org.yuzu.yuzu_emu.features.fetcher.SpacingItemDecoration
-import org.yuzu.yuzu_emu.model.HomeSetting
-import org.yuzu.yuzu_emu.utils.LosslessScalingHelper
-import org.yuzu.yuzu_emu.utils.ViewUtils.updateMargins
-import org.yuzu.yuzu_emu.utils.collect
-
-class LosslessManagerFragment : Fragment() {
-    private var _binding: FragmentLosslessManagerBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentLosslessManagerBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.toolbarLossless.setNavigationOnClickListener {
-            requireActivity().onBackPressedDispatcher.onBackPressed()
-        }
-
-        binding.losslessOptionsList.apply {
-            layoutManager =
-                GridLayoutManager(requireContext(), resources.getInteger(R.integer.grid_columns))
-            addItemDecoration(
-                SpacingItemDecoration(resources.getDimensionPixelSize(R.dimen.spacing_small))
-            )
-        }
-
-        LosslessScalingHelper.statusText.collect(viewLifecycleOwner) { refreshOptions() }
-
-        setInsets()
-    }
-
-    private fun refreshOptions() {
-        binding.losslessOptionsList.adapter = HomeSettingAdapter(
-            requireActivity() as AppCompatActivity,
-            viewLifecycleOwner,
-            buildOptions()
-        )
-    }
-
-    private fun buildOptions(): List<HomeSetting> {
-        val installed = LosslessScalingHelper.isInstalled()
-        return listOf(
-            HomeSetting(
-                if (installed) R.string.lossless_scaling_replace else R.string.lossless_scaling_install,
-                if (installed) {
-                    R.string.lossless_scaling_replace_description
-                } else {
-                    R.string.lossless_scaling_install_description
-                },
-                R.drawable.ic_install,
-                { dllPickerLauncher.launch(arrayOf("*/*")) },
-                { !NativeLibrary.isRunning() },
-                R.string.lossless_scaling_locked,
-                R.string.lossless_scaling_locked_description,
-                LosslessScalingHelper.statusText
-            ),
-            HomeSetting(
-                R.string.lossless_scaling_remove,
-                R.string.lossless_scaling_remove_description,
-                R.drawable.ic_delete,
-                { confirmRemoval() },
-                { installed && !NativeLibrary.isRunning() },
-                if (installed) {
-                    R.string.lossless_scaling_locked
-                } else {
-                    R.string.lossless_scaling_remove_unavailable
-                },
-                if (installed) {
-                    R.string.lossless_scaling_locked_description
-                } else {
-                    R.string.lossless_scaling_remove_unavailable_description
-                }
-            )
-        )
-    }
-
-    private fun confirmRemoval() {
-        MessageDialogFragment.newInstance(
-            requireActivity(),
-            titleId = R.string.lossless_scaling_remove,
-            descriptionId = R.string.lossless_scaling_remove_confirmation,
-            positiveButtonTitleId = R.string.lossless_scaling_remove,
-            positiveAction = { LosslessScalingHelper.remove() },
-            showNegativeButton = true,
-            negativeAction = {}
-        ).show(parentFragmentManager, MessageDialogFragment.TAG)
-    }
-
-    private val dllPickerLauncher =
-        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
-                return@registerForActivityResult
-            }
-
-            val resultStrings = resources.getStringArray(R.array.losslessDllResults)
-            ProgressDialogFragment.newInstance(
-                requireActivity(),
-                R.string.lossless_scaling_installing,
-                false
-            ) { _, _ ->
-                val installResult = LosslessScalingHelper.install(result)
-                if (installResult == LosslessScalingHelper.RESULT_OK) {
-                    getString(R.string.lossless_scaling_install_success)
-                } else {
-                    MessageDialogFragment.newInstance(
-                        titleId = R.string.lossless_scaling_install_failed,
-                        descriptionString = resultStrings[installResult]
-                    )
-                }
-            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
-        }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
-            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
-
-            binding.appbarLossless.updateMargins(
-                left = barInsets.left + cutoutInsets.left,
-                right = barInsets.right + cutoutInsets.right
-            )
-
-            binding.scrollViewLossless.updatePadding(bottom = barInsets.bottom)
-
-            binding.losslessOptionsList.updatePadding(
-                left = barInsets.left + cutoutInsets.left,
-                right = barInsets.right + cutoutInsets.right
-            )
-
-            windowInsets
-        }
-}

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -42,7 +42,6 @@ import org.yuzu.yuzu_emu.model.SetupPage
 import org.yuzu.yuzu_emu.model.PageState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
-import org.yuzu.yuzu_emu.utils.LosslessScalingHelper
 import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.ViewUtils
 import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
@@ -203,24 +202,6 @@ class SetupFragment : Fragment() {
                                 R.string.install_firmware_warning_help,
                             )
                         )
-                        add(
-                            PageButton(
-                                R.drawable.ic_duck,
-                                R.string.lossless_scaling,
-                                R.string.lossless_scaling_setup_description,
-                                {
-                                    pageButtonCallback = it
-                                    getLosslessDll.launch(arrayOf("*/*"))
-                                },
-                                {
-                                    if (LosslessScalingHelper.isInstalled()) {
-                                        ButtonState.BUTTON_ACTION_COMPLETE
-                                    } else {
-                                        ButtonState.BUTTON_ACTION_INCOMPLETE
-                                    }
-                                }
-                            )
-                        )
                         add(
                             PageButton(
                                 R.drawable.ic_controller,
@@ -465,32 +446,6 @@ class SetupFragment : Fragment() {
             }
         }
 
-    val getLosslessDll =
-        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
-                return@registerForActivityResult
-            }
-
-            val resultStrings = resources.getStringArray(R.array.losslessDllResults)
-            ProgressDialogFragment.newInstance(
-                requireActivity(),
-                R.string.lossless_scaling_installing,
-                false
-            ) { _, _ ->
-                val installResult = LosslessScalingHelper.install(result)
-                if (installResult == LosslessScalingHelper.RESULT_OK) {
-                    getString(R.string.lossless_scaling_install_success)
-                } else {
-                    MessageDialogFragment.newInstance(
-                        titleId = R.string.lossless_scaling_install_failed,
-                        descriptionString = resultStrings[installResult]
-                    )
-                }
-            }.apply {
-                onDialogComplete = { checkForButtonState.invoke() }
-            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
-        }
-
     val getGamesDirectory =
         registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
             if (result != null) {

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

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package org.yuzu.yuzu_emu.fragments
@@ -72,18 +72,6 @@ class SystemInfoDialogFragment : DialogFragment() {
 
                 val vulkanDriver = NativeLibrary.getVulkanDriverVersion()
                 appendLine("${getString(R.string.vulkan_driver_version)}: $vulkanDriver")
-
-                val frameGen = NativeLibrary.supportsFrameGeneration()
-                appendLine(
-                    "${getString(R.string.frame_generation_support)}: " +
-                        getString(
-                            if (frameGen) {
-                                R.string.frame_generation_supported
-                            } else {
-                                R.string.frame_generation_unsupported
-                            }
-                        )
-                )
             } catch (e: Exception) {
                 appendLine("${getString(R.string.error_getting_emulator_info)}: ${e.message}")
             }

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

@@ -1,77 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-package org.yuzu.yuzu_emu.utils
-
-import android.net.Uri
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.YuzuApplication
-import java.io.File
-
-object LosslessScalingHelper {
-    const val RESULT_OK = 0
-    const val RESULT_NOT_INSTALLED = 1
-
-    private val _statusText = MutableStateFlow("")
-    val statusText: StateFlow<String> = _statusText.asStateFlow()
-
-    private var installed: Boolean? = null
-    private var gpuSupported: Boolean? = null
-
-    fun isInstalled(): Boolean = installed ?: refreshStatus()
-
-    fun isSupportedByGpu(): Boolean {
-        val cached = gpuSupported
-        if (cached != null) {
-            return cached
-        }
-        val result = NativeLibrary.supportsFrameGeneration()
-        gpuSupported = result
-        return result
-    }
-
-    fun refreshStatus(): Boolean {
-        val result = NativeLibrary.validateLosslessDll() == RESULT_OK
-        installed = result
-
-        val context = YuzuApplication.appContext
-        _statusText.value = if (result) {
-            context.getString(R.string.lossless_scaling_installed)
-        } else {
-            context.getString(R.string.lossless_scaling_not_installed)
-        }
-        return result
-    }
-
-    fun install(source: Uri): Int {
-        val destination = File(NativeLibrary.getLosslessDllPath())
-        destination.parentFile?.mkdirs()
-
-        val copied = FileUtil.copyUriToInternalStorage(
-            source,
-            destination.parent!!,
-            destination.name
-        )
-        if (copied == null) {
-            refreshStatus()
-            return RESULT_NOT_INSTALLED
-        }
-
-        val result = NativeLibrary.prepareLosslessDll()
-        if (result != RESULT_OK) {
-            NativeLibrary.removeLosslessDll()
-        }
-        refreshStatus()
-        return result
-    }
-
-    fun remove(): Boolean {
-        val removed = NativeLibrary.removeLosslessDll()
-        refreshStatus()
-        return removed
-    }
-}

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

@@ -33,9 +33,8 @@ void AndroidConfig::SaveAllValues() {
 }
 
 void AndroidConfig::ReadAndroidValues() {
-    Settings::values.rescale_hack.SetValue(false);
-    ReadAndroidUIValues();
     if (global) {
+        ReadAndroidUIValues();
         ReadUIValues();
         BeginGroup(Settings::TranslateCategory(Settings::Category::DataStorage));
         Settings::values.ext_content_from_game_dirs = ReadBooleanSetting(
@@ -224,8 +223,8 @@ void AndroidConfig::ReadAndroidControlValues() {
 }
 
 void AndroidConfig::SaveAndroidValues() {
-    SaveAndroidUIValues();
     if (global) {
+        SaveAndroidUIValues();
         SaveUIValues();
         SaveOverlayValues();
     }

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

@@ -147,7 +147,7 @@ namespace AndroidSettings {
                                                       &show_performance_overlay};
 
 
-        Settings::SwitchableSetting<s32> pipeline_worker_count{linkage, 2, "pipeline_worker_count",
+        Settings::Setting<s32> pipeline_worker_count{linkage, 4, "pipeline_worker_count",
                                  Settings::Category::Android,
                                  Settings::Specialization::Default,
                                  true,

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

@@ -124,18 +124,9 @@ float EmuWindow_Android::GetFrameTimeVerifiedHint() const {
     return QuantizeFrameRateHint(verified_rate);
 }
 
-float EmuWindow_Android::GetPresentedFrameMultiplier() {
-    if (!Settings::values.frame_gen.GetValue()) {
-        return 1.0f;
-    }
-    return static_cast<float>(std::clamp<u32>(Settings::values.frame_gen_multiplier.GetValue(), 2, 4));
-}
-
 float EmuWindow_Android::GetFrameRateHint() const {
-    const float presented_multiplier = GetPresentedFrameMultiplier();
-    const float observed_rate =
-        std::clamp(m_smoothed_present_rate * presented_multiplier, 0.0f, 240.0f);
-    const float frame_time_verified_hint = GetFrameTimeVerifiedHint() * presented_multiplier;
+    const float observed_rate = std::clamp(m_smoothed_present_rate, 0.0f, 240.0f);
+    const float frame_time_verified_hint = GetFrameTimeVerifiedHint();
 
     if (m_last_frame_rate_hint > 0.0f && observed_rate > 0.0f) {
         const float tolerance = std::max(m_last_frame_rate_hint * 0.12f, 4.0f);
@@ -159,9 +150,9 @@ float EmuWindow_Android::GetFrameRateHint() const {
         return frame_time_verified_hint;
     }
 
-    const float nominal_rate = 60.0f * presented_multiplier;
+    constexpr float NominalFrameRate = 60.0f;
     if (!Settings::values.use_speed_limit.GetValue()) {
-        return QuantizeFrameRateHint(nominal_rate);
+        return NominalFrameRate;
     }
 
     const u16 speed_limit = Settings::SpeedLimit();
@@ -170,7 +161,7 @@ float EmuWindow_Android::GetFrameRateHint() const {
     }
 
     const float speed_limited_rate =
-        nominal_rate * (static_cast<float>(std::min<u16>(speed_limit, 100)) / 100.0f);
+        NominalFrameRate * (static_cast<float>(std::min<u16>(speed_limit, 100)) / 100.0f);
     return QuantizeFrameRateHint(speed_limited_rate);
 }
 

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

@@ -61,7 +61,6 @@ private:
     void UpdateObservedFrameRate();
     [[nodiscard]] float GetFrameRateHint() const;
     [[nodiscard]] float GetFrameTimeVerifiedHint() const;
-    [[nodiscard]] static float GetPresentedFrameMultiplier();
     [[nodiscard]] static float QuantizeFrameRateHint(float frame_rate);
 
     float m_window_width{};

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

@@ -44,7 +44,6 @@ extern "C" {
 #include "common/android/android_common.h"
 #include "common/android/id_cache.h"
 #include "common/dynamic_library.h"
-#include "common/fs/fs_util.h"
 #include "common/fs/path_util.h"
 #include "common/logging.h"
 #include "common/scm_rev.h"
@@ -91,7 +90,6 @@ extern "C" {
 #include "hid_core/hid_types.h"
 #include "input_common/drivers/virtual_amiibo.h"
 #include "jni/native.h"
-#include "video_core/frame_gen/lossless_dll.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_vulkan/renderer_vulkan.h"
 #include "video_core/capture.h"
@@ -1000,7 +998,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject
         FILE* f = std::fopen(CPUINFO_PATH, "r");
         if (!f) return Common::Android::ToJString(env, result);
 
-        char buf[4096];
+        char buf[512];
 
         if (f) {
             std::set<std::string> feature_set;
@@ -1031,13 +1029,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject
             bool has_dotprod = feature_set.count("asimddp") || feature_set.count("dotprod");
             bool has_i8mm = feature_set.count("i8mm");
             bool has_bf16 = feature_set.count("bf16");
-            bool has_fp16 = feature_set.count("fphp") || feature_set.count("asimdhp");
             bool has_atomics = feature_set.count("atomics") || feature_set.count("lse");
-            bool has_lse2 = feature_set.count("uscat");
-            bool has_rcpc = feature_set.count("lrcpc");
-            bool has_rcpc2 = feature_set.count("ilrcpc");
-            bool has_flagm = feature_set.count("flagm");
-            bool has_flagm2 = feature_set.count("flagm2");
 
             std::string features;
             if (has_neon || has_fp) {
@@ -1045,7 +1037,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject
                 if (has_dotprod) features += "+DP";
                 if (has_i8mm) features += "+I8MM";
                 if (has_bf16) features += "+BF16";
-                if (has_fp16) features += "+FP16";
             }
 
             if (has_sve) {
@@ -1062,19 +1053,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject
             if (has_atomics) {
                 if (!features.empty()) features += " | ";
                 features += "LSE";
-                if (has_lse2) features += "2";
-            }
-
-            if (has_rcpc) {
-                if (!features.empty()) features += " | ";
-                features += "RCpc";
-                if (has_rcpc2) features += "2";
-            }
-
-            if (has_flagm) {
-                if (!features.empty()) features += " | ";
-                features += "FlagM";
-                if (has_flagm2) features += "2";
             }
 
             if (!features.empty()) {
@@ -1112,34 +1090,6 @@ VkPhysicalDeviceProperties GetVulkanDeviceProperties() {
     const Vulkan::vk::PhysicalDevice physical_device(physical_devices[0], dld);
     return physical_device.GetProperties();
 }
-
-bool GetVulkanMemoryModelSupport() {
-    Common::DynamicLibrary library;
-    if (!library.Open("libvulkan.so")) {
-        return false;
-    }
-
-    Vulkan::vk::InstanceDispatch dld;
-    const auto instance = Vulkan::CreateInstance(library, dld, VK_API_VERSION_1_1);
-    const auto physical_devices = instance.EnumeratePhysicalDevices();
-    if (physical_devices.empty()) {
-        return false;
-    }
-
-    const Vulkan::vk::PhysicalDevice physical_device(physical_devices[0], dld);
-
-    VkPhysicalDeviceVulkanMemoryModelFeatures memory_model{
-        .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_MEMORY_MODEL_FEATURES,
-        .pNext = nullptr,
-    };
-    VkPhysicalDeviceFeatures2 features{
-        .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2,
-        .pNext = &memory_model,
-    };
-    physical_device.GetFeatures2(features);
-
-    return memory_model.vulkanMemoryModel == VK_TRUE;
-}
 } // namespace
 
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getVulkanDriverVersion(JNIEnv* env, jobject jobj) {
@@ -1215,14 +1165,6 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getVulkanApiVersion(JNIEnv* env, j
     }
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_supportsFrameGeneration(JNIEnv* env, jobject jobj) {
-    try {
-        return static_cast<jboolean>(GetVulkanMemoryModelSupport());
-    } catch (...) {
-        return static_cast<jboolean>(false);
-    }
-}
-
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuModel(JNIEnv* env, jobject jobj) {
     const auto props = GetVulkanDeviceProperties();
     if (props.deviceID == 0) {
@@ -1448,39 +1390,6 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_installKeys(JNIEnv* env, jclass clazz
     return static_cast<int>(FirmwareManager::InstallKeys(path, ext));
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getLosslessDllPath(JNIEnv* env, jclass clazz) {
-#ifdef HAS_LSFG
-    const auto path = VideoCore::FrameGen::GetLosslessDllPath();
-    return Common::Android::ToJString(env, Common::FS::PathToUTF8String(path));
-#else
-    return Common::Android::ToJString(env, "");
-#endif
-}
-
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_validateLosslessDll(JNIEnv* env, jclass clazz) {
-#ifdef HAS_LSFG
-    return static_cast<jint>(VideoCore::FrameGen::GetInstalledLosslessStatus());
-#else
-    return static_cast<jint>(VideoCore::FrameGen::LosslessStatus::NotInstalled);
-#endif
-}
-
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_prepareLosslessDll(JNIEnv* env, jclass clazz) {
-#ifdef HAS_LSFG
-    return static_cast<jint>(VideoCore::FrameGen::BuildShaderCache());
-#else
-    return static_cast<jint>(VideoCore::FrameGen::LosslessStatus::NotInstalled);
-#endif
-}
-
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_removeLosslessDll(JNIEnv* env, jclass clazz) {
-#ifdef HAS_LSFG
-    return static_cast<jboolean>(VideoCore::FrameGen::RemoveInstalledLosslessDll());
-#else
-    return static_cast<jboolean>(false);
-#endif
-}
-
 jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env, jobject jobj,
                                                                      jstring jpath,
                                                                      jstring jprogramId) {

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

@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M11,10.6a8,5.2 0 1,0 0,10.4a8,5.2 0 1,0 0,-10.4z" />
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M4.6,12.6L0.8,10.2L3.2,15.5z" />
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:fillType="evenOdd"
-        android:pathData="M15.3,3.5a4,4 0 1,0 0,8a4,4 0 1,0 0,-8zM16.6,4.9a1,1 0 1,0 0,2a1,1 0 1,0 0,-2z" />
-    <path
-        android:fillColor="?attr/colorControlNormal"
-        android:pathData="M18.6,6.5L23.2,7.8L18.6,9.3z" />
-</vector>

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

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbar_lossless"
-        style="@style/Widget.Eden.TransparentTopAppBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:touchscreenBlocksFocus="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_lossless"
-            style="@style/Widget.Eden.TransparentTopToolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:touchscreenBlocksFocus="false"
-            app:navigationIcon="@drawable/ic_back"
-            app:title="@string/lossless_scaling" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scroll_view_lossless"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@android:color/transparent"
-        android:clipToPadding="false"
-        android:defaultFocusHighlightEnabled="false"
-        android:fadeScrollbars="false"
-        android:scrollbars="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appbar_lossless">
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingHorizontal="16dp"
-            android:paddingTop="16dp">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lossless_options_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipToPadding="false"
-                android:nestedScrollingEnabled="false" />
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
-
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -47,12 +47,6 @@
             android:defaultValue="@null" />
     </fragment>
 
-    <fragment
-        android:id="@+id/losslessManagerFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.LosslessManagerFragment"
-        android:label="@string/lossless_scaling"
-        tools:layout="@layout/fragment_lossless_manager" />
-
     <fragment
         android:id="@+id/appletLauncherFragment"
         android:name="org.yuzu.yuzu_emu.fragments.AppletLauncherFragment"

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

@@ -514,6 +514,8 @@
     <string name="fix_bloom_effects_description">يقلل من ضبابية التوهج في LA/EOW  (Adreno A6XX - A7XX/ Turnip)، ويزيل التوهج في Burnout. تحذير: قد يسبب تشوهات رسومية في ألعاب أخرى.</string>
     <string name="emulate_bgr565">محاكاة BGR565</string>
     <string name="emulate_bgr565_description">يُصلح مشاكل انعكاس الألوان في الألعاب أو ظهور تشوهات غريبة أو ظلال غريبة.</string>
+    <string name="rescale_hack">تفعيل ميزة إعادة التحجيم القديمة</string>
+    <string name="rescale_hack_description">يُمكّن هذا الخيار من التعامل مع عملية إعادة تحجيم الألعاب بطريقة تقليدية باستخدام مسار إعادة التحجيم السريع</string>
     <string name="renderer_asynchronous_shaders">استخدم تظليل غير متزامن</string>
     <string name="renderer_asynchronous_shaders_description">يقوم بتجميع التظليل بشكل غير متزامن. قد يقلل ذلك من التقطعات ولكنه قد يؤدي أيضًا إلى حدوث أخطاء.</string>
     <string name="gpu_unswizzle_settings">إعدادات إلغاء ترتيب بيانات وحدة معالجة الرسومات</string>
@@ -1086,6 +1088,7 @@
     <string name="theme_mode_light">فاتح</string>
     <string name="theme_mode_dark">داكن</string>
 
+    <string name="multiplier_none">لا شيء</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">خلفيات سوداء</string>

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

@@ -1004,6 +1004,7 @@ Wirklich fortfahren?</string>
     <string name="theme_mode_light">Hell</string>
     <string name="theme_mode_dark">Dunkel</string>
 
+    <string name="multiplier_none">Keine</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Schwarze Hintergründe</string>

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

@@ -506,6 +506,8 @@
     <string name="fix_bloom_effects_description">Reduce el efecto de resplandor en LA/EOW (Adreno A6XX - A7XX/ Turnip), elimina el resplandor en Burnout. Advertencia: puede causar artefactos gráficos en otros juegos.</string>
     <string name="emulate_bgr565">Emular BGR565</string>
     <string name="emulate_bgr565_description">Soluciona problemas con colores invertidos en juegos, artefactos o sombras extrañas.</string>
+    <string name="rescale_hack">Activar la pasada de reescalado heredada</string>
+    <string name="rescale_hack_description">Permite el manejo de versiones anteriores para el paso de configuración de reescalado para juegos mediante el uso de una ruta de reescalado rápida.</string>
     <string name="renderer_asynchronous_shaders">Usar sombreadores asíncronos</string>
     <string name="renderer_asynchronous_shaders_description">Compila los sombreadores de forma asíncrona. Esto puede reducir los tirones, pero también puede introducir errores gráficos.</string>
     <string name="gpu_unswizzle_settings">Ajustes de desentrelazado de la GPU</string>
@@ -1078,6 +1080,7 @@
     <string name="theme_mode_light">Claro</string>
     <string name="theme_mode_dark">Oscuro</string>
 
+    <string name="multiplier_none">Nada</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Fondos oscuros</string>

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

@@ -808,6 +808,9 @@
     <string name="multiplier_x4">x4</string>
     <string name="multiplier_x8">x8</string>
     <string name="multiplier_x16">x16</string>
+    <string name="multiplier_x32">x32</string>
+    <string name="multiplier_x64">x64</string>
+    <string name="multiplier_none">None</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">پس‌زمینه مشکی</string>

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

@@ -1016,6 +1016,7 @@
     <string name="theme_mode_light">Lumineux</string>
     <string name="theme_mode_dark">Sombre</string>
 
+    <string name="multiplier_none">Aucun</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Arrière-plan noir</string>

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

@@ -948,6 +948,7 @@
     <string name="theme_mode_light">Jasny</string>
     <string name="theme_mode_dark">Ciemny</string>
 
+    <string name="multiplier_none">Brak</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Czarne tła</string>

src/android/app/src/main/res/values-pt-rBR/strings.xml

@@ -897,6 +897,7 @@
     <string name="theme_mode_light">Claro</string>
     <string name="theme_mode_dark">Escuro</string>
 
+    <string name="multiplier_none">Nenhum</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Planos de fundo pretos</string>

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

@@ -510,6 +510,8 @@
     <string name="fix_bloom_effects_description">Частично убирает размытие в LA/EOW (Adreno A6XX - A7XX/ Turnip), полностью отключает его в Burnout. Внимание: может вызывать графические артефакты в других играх.</string>
     <string name="emulate_bgr565">Эмулировать BGR565</string>
     <string name="emulate_bgr565_description">Исправляет проблемы с инвертированными цветами в играх, а также со странными артефактами или некорректными тенями.</string>
+    <string name="rescale_hack">Включить старый метод изменения разрешения</string>
+    <string name="rescale_hack_description">Включает старый метод обработки этапа перенастройки масштабирования для игр за счёт использования быстрого алгоритма перемасштабирования.</string>
     <string name="renderer_asynchronous_shaders">Использовать асинхронные шейдеры</string>
     <string name="renderer_asynchronous_shaders_description">Компилирует шейдеры асинхронно. Это может уменьшить подтормаживания, но также может вызвать графические артефакты.</string>
     <string name="gpu_unswizzle_settings">Настройки распаковки текстур (Unswizzle)</string>
@@ -1082,6 +1084,7 @@
     <string name="theme_mode_light">Светлая</string>
     <string name="theme_mode_dark">Темная</string>
 
+    <string name="multiplier_none">Отключено</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Чёрный фон</string>

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

@@ -505,6 +505,8 @@
     <string name="fix_bloom_effects_description">Зменшує розмиття світіння в LA/EOW (Adreno A6XX–A7XX / Turnip), прибирає світіння в Burnout. Увага: може спричинити графічні артефакти в інших іграх.</string>
     <string name="emulate_bgr565">Емулювати BGR565</string>
     <string name="emulate_bgr565_description">Виправляє проблеми з інвертованими кольорами в іграх або дивними артефактами чи тінями.</string>
+    <string name="rescale_hack">Увімкнути застаріле масштабування</string>
+    <string name="rescale_hack_description">Вмикає застарілу обробку масштабування для ігор, використовуючи швидкий шлях масштабування</string>
     <string name="renderer_asynchronous_shaders">Асинхронні шейдери</string>
     <string name="renderer_asynchronous_shaders_description">Компілює шейдери асинхронно. Це може зменшити затримки, але також може спричинити графічні баги.</string>
     <string name="gpu_unswizzle_settings">Налаштування розпакування за допомогою ГП</string>
@@ -1064,6 +1066,7 @@
     <string name="theme_mode_light">Світла</string>
     <string name="theme_mode_dark">Темна</string>
 
+    <string name="multiplier_none">Жодного</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Чорний фон</string>

src/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -504,6 +504,8 @@
     <string name="fix_bloom_effects_description">减少《智慧的再现》和《众神的三角力量2》（Adreno A6XX - A7XX/ Turnip）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现图形异常。</string>
     <string name="emulate_bgr565">模拟 BGR565</string>
     <string name="emulate_bgr565_description">修复游戏中的颜色反转或是异常的画面瑕疵或阴影问题</string>
+    <string name="rescale_hack">启用旧版缩放处理</string>
+    <string name="rescale_hack_description">启用通过使用快速缩放路径，来为游戏提供缩放配置处理的传统处理方式</string>
     <string name="renderer_asynchronous_shaders">使用异步着色器</string>
     <string name="renderer_asynchronous_shaders_description">以异步方式编译着色器。采用此方式或可减少卡顿，但也可能引入故障点。</string>
     <string name="gpu_unswizzle_settings">GPU Unswizzle 设置</string>
@@ -1076,6 +1078,7 @@
     <string name="theme_mode_light">浅色</string>
     <string name="theme_mode_dark">深色</string>
 
+    <string name="multiplier_none">无</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">使用黑色背景</string>

src/android/app/src/main/res/values-zh-rTW/strings.xml

@@ -926,6 +926,7 @@
     <string name="theme_mode_light">淺色</string>
     <string name="theme_mode_dark">深色</string>
 
+    <string name="multiplier_none">無</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">黑色背景</string>

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

@@ -162,48 +162,6 @@
         <item>@string/resolution_four</item>
     </string-array>
 
-    <string-array name="frameGenMultiplierNames">
-        <item>@string/frame_gen_multiplier_2x</item>
-        <item>@string/frame_gen_multiplier_3x</item>
-        <item>@string/frame_gen_multiplier_4x</item>
-    </string-array>
-
-    <integer-array name="frameGenMultiplierValues">
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </integer-array>
-
-    <string-array name="frameGenTargetRateNames">
-        <item>@string/frame_gen_target_rate_off</item>
-        <item>@string/frame_gen_target_rate_60</item>
-        <item>@string/frame_gen_target_rate_90</item>
-        <item>@string/frame_gen_target_rate_120</item>
-        <item>@string/frame_gen_target_rate_144</item>
-        <item>@string/frame_gen_target_rate_165</item>
-    </string-array>
-
-    <integer-array name="frameGenTargetRateValues">
-        <item>0</item>
-        <item>60</item>
-        <item>90</item>
-        <item>120</item>
-        <item>144</item>
-        <item>165</item>
-    </integer-array>
-
-    <string-array name="frameGenQueueTargetNames">
-        <item>@string/frame_gen_queue_target_0</item>
-        <item>@string/frame_gen_queue_target_1</item>
-        <item>@string/frame_gen_queue_target_2</item>
-    </string-array>
-
-    <integer-array name="frameGenQueueTargetValues">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </integer-array>
-
     <string-array name="rendererVSyncNames">
         <item>@string/renderer_vsync_immediate</item>
         <item>@string/renderer_vsync_mailbox</item>
@@ -513,6 +471,9 @@
         <item>@string/multiplier_x4</item>
         <item>@string/multiplier_x8</item>
         <item>@string/multiplier_x16</item>
+        <item>@string/multiplier_x32</item>
+        <item>@string/multiplier_x64</item>
+        <item>@string/multiplier_none</item>
     </string-array>
     <integer-array name="anisoValues">
         <item>0</item>
@@ -521,6 +482,9 @@
         <item>3</item>
         <item>4</item>
         <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
     </integer-array>
 
     <string-array name="verticalAlignmentEntries">
@@ -674,16 +638,6 @@
         <item>@string/error_keys_failed_init</item>
     </string-array>
 
-    <string-array name="losslessDllResults">
-        <item>""</item>
-        <item>@string/error_lossless_copy_failed</item>
-        <item>@string/error_lossless_unreadable</item>
-        <item>@string/error_lossless_not_pe</item>
-        <item>@string/error_lossless_missing_shaders</item>
-        <item>@string/error_lossless_translation_failed</item>
-        <item>@string/error_lossless_cache_failed</item>
-    </string-array>
-
     <!-- GPU Logging Arrays -->
     <string-array name="gpuLogLevelEntries">
         <item>Off</item>

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

@@ -298,67 +298,6 @@
     <string name="gpu_driver_fetcher">GPU driver fetcher</string>
     <string name="gpu_driver_manager">GPU driver manager</string>
     <string name="install_gpu_driver_description">Install alternative drivers for potentially better performance or accuracy</string>
-    <string name="frame_gen">Frame generation</string>
-    <string name="frame_gen_per_game_description">Configure frame generation for this game</string>
-    <string name="frame_gen_description">Insert interpolated frames between rendered ones using Lossless Scaling. Forces FIFO presentation while enabled.</string>
-    <string name="frame_gen_multiplier">Frame multiplier</string>
-    <string name="frame_gen_multiplier_description">How many frames to display for each rendered frame. Higher values cost proportionally more GPU time. Asking for more than your display can present will slow emulation down.</string>
-    <string name="frame_gen_multiplier_2x">2x</string>
-    <string name="frame_gen_multiplier_3x">3x</string>
-    <string name="frame_gen_multiplier_4x">4x</string>
-    <string name="frame_gen_target_rate">Target frame rate</string>
-    <string name="frame_gen_target_rate_description">Pick the rate your display can actually show. The multiplier then rises or falls on its own to hold it, and rolls back any step that makes the game itself run slower.</string>
-    <string name="frame_gen_target_rate_off">Use a fixed multiplier</string>
-    <string name="frame_gen_target_rate_60">60 FPS</string>
-    <string name="frame_gen_target_rate_90">90 FPS</string>
-    <string name="frame_gen_target_rate_120">120 FPS</string>
-    <string name="frame_gen_target_rate_144">144 FPS</string>
-    <string name="frame_gen_target_rate_165">165 FPS</string>
-    <string name="frame_gen_queue_target">Frame queue target</string>
-    <string name="frame_gen_queue_target_description">How many finished frames may wait ahead of the display. Larger queues absorb GPU spikes at the cost of input latency.</string>
-    <string name="frame_gen_queue_target_0">Lowest latency (Unbuffered)</string>
-    <string name="frame_gen_queue_target_1">Balanced (1 frame)</string>
-    <string name="frame_gen_queue_target_2">Smoothest (2 frames)</string>
-    <string name="frame_gen_flow_scale_auto">Match motion estimation to the game</string>
-    <string name="frame_gen_flow_scale_auto_description">Estimate motion at the resolution the game actually renders instead of the upscaled output. Costs nothing in accuracy, since upscaling adds no motion detail.</string>
-    <string name="frame_gen_flow_scale">Motion estimation resolution</string>
-    <string name="frame_gen_flow_scale_description">Resolution of the optical flow pass, as a fraction of the output. Lowering it is the cheapest way to reclaim performance.</string>
-    <string name="frame_gen_fp16">Half precision shaders</string>
-    <string name="frame_gen_fp16_description">Use the 16-bit shader variant. Falls back automatically if the driver or the file lacks it.</string>
-    <string name="frame_gen_dump_flow">Dump generated frame</string>
-    <string name="frame_gen_dump_flow_description">Write the optical flow mip levels and the interpolated frame to the lossless/debug folder once, for troubleshooting</string>
-    <string name="frame_gen_unsupported">Frame generation unavailable</string>
-    <string name="frame_gen_unsupported_description">This GPU driver does not support the Vulkan memory model, which the Lossless Scaling shaders require.</string>
-    <string name="lossless_scaling_setup_description">Optional. Provide your own Lossless.dll to enable frame generation later</string>
-    <string name="lossless_scaling_install">Install Lossless.dll</string>
-    <string name="lossless_scaling_install_description">Frame generation needs your own legal copy of Lossless.dll from Lossless Scaling</string>
-    <string name="lossless_scaling_replace_description">Select a different copy of Lossless.dll</string>
-    <string name="frame_generation_support">Frame generation</string>
-    <string name="frame_generation_supported">Supported</string>
-    <string name="frame_generation_unsupported">Unsupported (no Vulkan memory model)</string>
-    <string name="lossless_scaling">Lossless Scaling</string>
-    <string name="lossless_scaling_description">Provide your own copy of Lossless.dll to enable frame generation</string>
-    <string name="lossless_scaling_installed">Installed</string>
-    <string name="lossless_scaling_not_installed">Not installed</string>
-    <string name="lossless_scaling_replace">Replace</string>
-    <string name="lossless_scaling_remove">Remove</string>
-    <string name="lossless_scaling_remove_description">Delete the installed Lossless.dll and its prepared shaders</string>
-    <string name="lossless_scaling_remove_confirmation">Frame generation will stop working until you install Lossless.dll again. Your original file is not affected.</string>
-    <string name="lossless_scaling_missing">Lossless.dll not installed</string>
-    <string name="lossless_scaling_missing_description">Install it from Settings › Lossless Scaling to use frame generation.</string>
-    <string name="lossless_scaling_locked">Close the game first</string>
-    <string name="lossless_scaling_locked_description">Lossless.dll cannot be changed while a game is running.</string>
-    <string name="lossless_scaling_remove_unavailable">Nothing to remove</string>
-    <string name="lossless_scaling_remove_unavailable_description">Lossless.dll is not installed yet.</string>
-    <string name="lossless_scaling_installing">Preparing frame generation shaders…</string>
-    <string name="lossless_scaling_install_success">Lossless.dll installed successfully</string>
-    <string name="lossless_scaling_install_failed">Could not install Lossless.dll</string>
-    <string name="error_lossless_copy_failed">The selected file could not be copied.</string>
-    <string name="error_lossless_unreadable">The selected file could not be read.</string>
-    <string name="error_lossless_not_pe">The selected file is not a Windows library. Select Lossless.dll from your Lossless Scaling installation.</string>
-    <string name="error_lossless_missing_shaders">This copy of Lossless.dll does not contain the frame generation shaders. Update Lossless Scaling and try again.</string>
-    <string name="error_lossless_translation_failed">The frame generation shaders could not be translated. This version of Lossless Scaling is not supported yet.</string>
-    <string name="error_lossless_cache_failed">The translated shaders could not be written to storage. Check that there is free space available.</string>
     <string name="advanced_settings">Advanced settings</string>
     <string name="settings_description">Configure emulator settings</string>
     <string name="search_recently_played">Recently played</string>
@@ -581,6 +520,8 @@
     <string name="fix_bloom_effects_description">Reduces bloom blur in LA/EOW (Adreno A6XX - A7XX/ Turnip), removes bloom in Burnout. Warning: may cause graphical artifacts in other games.</string>
     <string name="emulate_bgr565">Emulate BGR565</string>
     <string name="emulate_bgr565_description">Fixes problems with inverted colors in games or strange artifacts or strange shadows.</string>
+    <string name="rescale_hack">Enable Legacy Rescale Pass</string>
+    <string name="rescale_hack_description">Enables a legacy handling for the rescale configuration pass for games by using a quick rescale path</string>
     <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string>
     <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously. This may reduce stutters but may also introduce glitches.</string>
     <string name="gpu_unswizzle_settings">GPU Unswizzle Settings</string>
@@ -1244,6 +1185,9 @@
     <string name="multiplier_x4" translatable="false">x4</string>
     <string name="multiplier_x8" translatable="false">x8</string>
     <string name="multiplier_x16" translatable="false">x16</string>
+    <string name="multiplier_x32" translatable="false">x32</string>
+    <string name="multiplier_x64" translatable="false">x64</string>
+    <string name="multiplier_none">None</string>
 
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Black backgrounds</string>

src/common/CMakeLists.txt

@@ -133,6 +133,7 @@ add_library(
     typed_address.h
     uint128.h
     unique_function.h
+    program_args.h
     random.cpp
     random.h
     uuid.cpp

src/common/fs/fs_paths.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
@@ -20,7 +20,6 @@
 #define KEYS_DIR "keys"
 #define LOAD_DIR "load"
 #define LOG_DIR "log"
-#define LOSSLESS_DIR "lossless"
 #define NAND_DIR "nand"
 #define PLAY_TIME_DIR "play_time"
 #define SCREENSHOTS_DIR "screenshots"
@@ -38,5 +37,3 @@
 
 // yuzu-specific files
 #define LOG_FILE "eden_log.txt"
-#define LOSSLESS_DLL_FILE "Lossless.dll"
-#define LOSSLESS_CACHE_FILE "lsfg_spirv.cache"

src/common/fs/path_util.cpp

@@ -157,7 +157,6 @@ public:
         GenerateEdenPath(EdenPath::KeysDir, eden_path / KEYS_DIR);
         GenerateEdenPath(EdenPath::LoadDir, eden_path / LOAD_DIR);
         GenerateEdenPath(EdenPath::LogDir, eden_path / LOG_DIR);
-        GenerateEdenPath(EdenPath::LosslessDir, eden_path / LOSSLESS_DIR);
         GenerateEdenPath(EdenPath::NANDDir, eden_path / NAND_DIR);
         GenerateEdenPath(EdenPath::PlayTimeDir, eden_path / PLAY_TIME_DIR);
         GenerateEdenPath(EdenPath::SaveDir, eden_path / NAND_DIR);

src/common/fs/path_util.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
@@ -23,7 +23,6 @@ enum class EdenPath {
     KeysDir,        // Where key files are stored.
     LoadDir,        // Where cheat/mod files are stored.
     LogDir,         // Where log files are stored.
-    LosslessDir,    // Where the user-supplied Lossless Scaling library is stored.
     NANDDir,        // Where the emulated NAND is stored.
     PlayTimeDir,    // Where play time data is stored.
     SaveDir,        // Where save data is stored.

src/common/program_args.cpp

@@ -0,0 +1,278 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <regex>
+#include "common/assert.h"
+#include "common/program_args.h"
+#include "common/logging.h"
+#include "common/scm_rev.h"
+#include "network/room.h"
+
+#undef _UNICODE
+#include <getopt.h>
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+
+namespace Common {
+
+static void PrintHelp(const char* argv0) {
+    LOG_INFO(Frontend, "Usage: {} [options] <filename>\n"
+        "Core options:\n"
+        "-c, --config            Load the specified configuration file\n"
+        "-f, --fullscreen        Start in fullscreen mode\n"
+        "-g, --game              File path of the game to load\n"
+        "-h, --help              Display this help and exit\n"
+        "-m, --multiplayer=nick:password@address:port Nickname, password, address and port for multiplayer\n"
+        "-p, --program           Pass following string as arguments to executable\n"
+        "-u, --user              Select a specific user profile from 0 to 7\n"
+        "-d, --debug             Run the GDB stub on a port from 1 to 65535\n"
+        "-i, --input-profile     Specifies input profile name to use (for player #0 only)\n"
+        "-n, --null-render       Forces the usage of the \"Null\" render backend irrespective of settings\n"
+        "-x, --filter            Sets the debug log filter irrespective of settings\n"
+        "-s, --singlecore        Forces single-core regardless of settings\n"
+        "Shared options:\n"
+        "-l, --log-file          The file for storing the room log\n"
+        "-H, --headless          Force headless mode (no GUI). Currently only used for rooms\n"
+#ifdef YUZU_ROOM
+        "Room options:\n"
+        "-N, --name              The name of the room\n"
+        "-D, --description       The room description\n"
+        "-S, --bind-address      The bind address for the room\n"
+        "-P, --port              The port used for the room\n"
+        "-M, --max-members       The maximum number of players for this room\n"
+        "-W, --password          The password for the room\n"
+        "-G, --preferred-game    The preferred game for this room\n"
+        "-I, --preferred-game-id The preferred game-id for this room\n"
+        "-U, --username          The username used for announce\n"
+        "-T, --token             The token used for announce\n"
+        "-A, --web-api-url       yuzu Web API url\n"
+        "-B, --ban-list-file     The file for storing the room ban list\n"
+#endif
+        "Misc. options:\n"
+        "-h, --help              Display this help and exit\n"
+        "-v, --version           Output version information and exit\n",
+        argv0);
+}
+
+static void PrintVersion() {
+    LOG_INFO(Frontend, "Eden {} {}, Libnetwork: {}", Common::g_scm_branch, Common::g_scm_desc, Network::network_version);
+}
+
+int ParseArguments(ProgramArguments& args, int argc, char *argv[]) {
+    int option_index = 0;
+#ifdef _WIN32
+    int argc_w;
+    auto argv_w = CommandLineToArgvW(GetCommandLineW(), &argc_w);
+    if (argv_w == nullptr) {
+        LOG_CRITICAL(Frontend, "Failed to get command line arguments");
+        return SDL_APP_FAILURE;
+    }
+#endif
+
+    static struct option long_options[] = {
+        // clang-format off
+        {"debug", no_argument, 0, 'd'},
+        {"config", required_argument, 0, 'c'},
+        {"fullscreen", no_argument, 0, 'f'},
+        {"help", no_argument, 0, 'h'},
+        {"game", required_argument, 0, 'g'},
+        {"multiplayer", required_argument, 0, 'm'},
+        {"program", optional_argument, 0, 'p'},
+        {"user", required_argument, 0, 'u'},
+        {"version", no_argument, 0, 'v'},
+        {"input-profile", no_argument, 0, 'i'},
+        {"null-render", no_argument, 0, 'n'},
+        {"singlecore", no_argument, 0, 's'},
+        {"filter", no_argument, 0, 'x'},
+
+        {"log-file", required_argument, 0, 'l'},
+        {"headless", required_argument, 0, 'H'},
+#ifdef YUZU_ROOM
+        {"room-name", required_argument, 0, 'N'},
+        {"room-description", required_argument, 0, 'D'},
+        {"bind-address", required_argument, 0, 'S'},
+        {"port", required_argument, 0, 'P'},
+        {"max-members", required_argument, 0, 'M'},
+        {"password", required_argument, 0, 'W'},
+        {"preferred-game", required_argument, 0, 'G'},
+        {"preferred-game-id", required_argument, 0, 'I'},
+        {"username", optional_argument, 0, 'U'},
+        {"token", required_argument, 0, 'T'},
+        {"web-api-url", required_argument, 0, 'A'},
+        {"ban-list-file", required_argument, 0, 'B'},
+        // Entry option
+        {"room", no_argument, 0, 0},
+#endif
+        {"hlaunch", no_argument, 0, 500},
+        {"qlaunch", no_argument, 0, 'q'},
+        {"setup", no_argument, 0, 502},
+        {0, 0, 0, 0},
+        // clang-format on
+    };
+
+    // Kept for compatibility!
+    for (int i = 1; i < argc; i++) {
+        if (strcmp(argv[i], "-hlaunch") == 0) {
+            args.should_launch_hlaunch = true;
+            return 0;
+        } else if (strcmp(argv[i], "-qlaunch") == 0) {
+            args.should_launch_qlaunch = true;
+            return 0;
+        } else if (strcmp(argv[i], "-setup") == 0) {
+            args.should_launch_setup = true;
+            return 0;
+        }
+    }
+
+    // Preserves drag and drop functionality (i.e ./eden <game path>)
+    char *endarg = nullptr;
+    while (optind < argc) {
+        int arg = getopt_long(argc, argv, "g:fhvcip::c:u:d:", long_options, &option_index);
+        if (arg != -1) {
+            switch (arg) {
+            case 'd':
+                args.override_gdb_port = uint16_t(atoi(optarg));
+                break;
+            case 'c':
+                args.config_path = optarg;
+                break;
+            case 'f':
+                args.fullscreen = true;
+                LOG_INFO(Frontend, "Starting in fullscreen mode...");
+                break;
+            case 'h':
+                PrintHelp(argv[0]);
+                return 0;
+            case 'g':
+                args.filepath = std::string(optarg);
+                break;
+            case 'i': {
+                args.input_profile = std::string(optarg);
+                break;
+            }
+            case 'm': {
+                args.use_multiplayer = true;
+                const std::string str_arg(optarg);
+                // regex to check if the format is nickname:password@ip:port
+                // with optional :password
+                const std::regex re("^([^:]+)(?::(.+))?@([^:]+)(?::([0-9]+))?$");
+                if (!std::regex_match(str_arg, re)) {
+                    LOG_ERROR(Frontend, "Wrong format for option --multiplayer");
+                    return -1;
+                } else {
+                    std::smatch match;
+                    std::regex_search(str_arg, match, re);
+                    ASSERT(match.size() == 5);
+                    args.nickname = match[1];
+                    args.password = match[2];
+                    args.address = match[3];
+                    if (!match[4].str().empty()) {
+                        args.port = u16(std::strtoul(match[4].str().c_str(), nullptr, 0));
+                    }
+                    std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$");
+                    if (!std::regex_match(args.nickname, nickname_re)) {
+                        LOG_ERROR(Frontend, "Nickname is not valid. Must be 4 to 20 alphanumeric characters");
+                        return -1;
+                    } else {
+                        if (args.address.empty()) {
+                            LOG_ERROR(Frontend, "Address to room must not be empty");
+                            return -1;
+                        }
+                    }
+                }
+                break;
+            }
+            case 'p':
+                args.program_args.assign(optarg);
+                break;
+            case 'u':
+                args.selected_user = atoi(optarg);
+                break;
+            case 'v':
+                PrintVersion();
+                break;
+            case 'n':
+                args.force_null_render = true;
+                break;
+            case 's':
+                args.force_single_core = true;
+                break;
+            case 'x':
+                args.log_filter.emplace(optarg);
+                break;
+            // shared
+            case 'l':
+                args.log_file.assign(optarg);
+                break;
+            case 'H':
+                args.headless.emplace(true);
+                break;
+            // room
+#ifdef YUZU_ROOM
+            case 'N':
+                args.room_name.assign(optarg);
+                break;
+            case 'D':
+                args.room_description.assign(optarg);
+                break;
+            case 'S':
+                args.bind_address.assign(optarg);
+                break;
+            case 'P': {
+                auto const value = strtoul(optarg, &endarg, 0);
+                if (value <= USHRT_MAX) {
+                    args.port = value;
+                } else {
+                    LOG_ERROR(Frontend, "port must be between 0-{}", USHRT_MAX);
+                }
+                break;
+            }
+            case 'M': {
+                auto const value = strtoul(optarg, &endarg, 0);
+                if (value >= 2 && value <= Network::MaxConcurrentConnections) {
+                    args.max_members = value;
+                } else {
+                    LOG_ERROR(Frontend, "max members must be between 2-{}", value, Network::MaxConcurrentConnections);
+                }
+                break;
+            }
+            case 'W':
+                args.password.assign(optarg);
+                break;
+            case 'G':
+                args.preferred_game.assign(optarg);
+                break;
+            case 'I':
+                args.preferred_game_id = strtoull(optarg, &endarg, 16);
+                break;
+            case 'U':
+                args.nickname.assign(optarg);
+                break;
+            case 'T':
+                args.token.assign(optarg);
+                break;
+            case 'A':
+                args.web_api_url.assign(optarg);
+                break;
+            case 'B':
+                args.ban_list_file.assign(optarg);
+                break;
+#endif
+            }
+        } else {
+#ifdef _WIN32
+            args.filepath = Common::UTF16ToUTF8(argv_w[optind]);
+#else
+            args.filepath = argv[optind];
+#endif
+            optind++;
+        }
+    }
+#ifdef _WIN32
+    LocalFree(argv_w);
+#endif
+    return 0;
+}
+
+}

src/common/program_args.h

@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <string>
+#include <optional>
+#include "common/common_types.h"
+
+namespace Common {
+
+inline constexpr u16 DEFAULT_ROOM_PORT = 24872;
+struct ProgramArguments {
+    std::optional<std::string> config_path{};
+    std::optional<std::string> log_filter{};
+    std::string nickname{};
+    std::string password{};
+    std::string address{};
+    std::string input_profile{};
+    std::string filepath{};
+    std::string program_args{};
+    std::string room_name{};
+    std::string room_description{};
+    std::string preferred_game{};
+    std::string username{};
+    std::string token{};
+    std::string web_api_url{};
+    std::string ban_list_file{};
+    std::string log_file = "eden-room.log";
+    std::string bind_address{};
+    std::optional<int> selected_user{};
+    std::optional<u16> override_gdb_port{};
+    std::optional<bool> headless{};
+    u64 preferred_game_id = 0;
+    u32 max_members = 16;
+    u16 port = DEFAULT_ROOM_PORT;
+    bool use_multiplayer = false;
+    bool fullscreen = false;
+    bool force_null_render = false;
+    bool force_single_core = false;
+
+    bool should_launch_qlaunch = false;
+    bool should_launch_hlaunch = false;
+    bool should_launch_setup = false;
+};
+
+int ParseArguments(ProgramArguments& args, int argc, char *argv[]);
+
+}

src/common/settings.cpp

@@ -380,28 +380,6 @@ void UpdateRescalingInfo() {
     TranslateResolutionInfo(setup, info);
 }
 
-u32 FrameGenMultiplier() {
-    return std::clamp(values.frame_gen_multiplier.GetValue(), MIN_FRAME_GEN_MULTIPLIER,
-                      MAX_FRAME_GEN_MULTIPLIER);
-}
-
-size_t FrameGenGenerations() {
-    if (!values.frame_gen.GetValue()) {
-        return 0;
-    }
-    return FrameGenMultiplier() - 1;
-}
-
-size_t FrameGenMaxGenerations() {
-    if (!values.frame_gen.GetValue()) {
-        return 0;
-    }
-    if (values.frame_gen_target_rate.GetValue() != 0) {
-        return MAX_FRAME_GEN_MULTIPLIER - 1;
-    }
-    return FrameGenMultiplier() - 1;
-}
-
 void RestoreGlobalState(bool is_powered_on) {
     // If a game is running, DO NOT restore the global settings state
     if (is_powered_on) {

src/common/settings.h

@@ -352,7 +352,7 @@ struct Values {
                                                   true};
 
     SwitchableSetting<ScalingFilter> scaling_filter{linkage,
-                                                    ScalingFilter::NearestNeighbor,
+                                                    ScalingFilter::Bilinear,
                                                     "scaling_filter",
                                                     Category::Renderer,
                                                     Specialization::Default,
@@ -388,69 +388,6 @@ struct Values {
                                                   true,
                                                   true};
 
-    SwitchableSetting<bool> frame_gen{linkage, false, "frame_gen", Category::Renderer,
-                                      Specialization::Default, true, false};
-
-    SwitchableSetting<u32, true> frame_gen_multiplier{linkage,
-                                                      2,
-                                                      2,
-                                                      4,
-                                                      "frame_gen_multiplier",
-                                                      Category::Renderer,
-                                                      Specialization::Countable,
-                                                      true,
-                                                      false,
-                                                      &frame_gen};
-
-    SwitchableSetting<u32, true> frame_gen_target_rate{linkage,
-                                                       0,
-                                                       0,
-                                                       240,
-                                                       "frame_gen_target_rate",
-                                                       Category::Renderer,
-                                                       Specialization::Countable,
-                                                       true,
-                                                       true,
-                                                       &frame_gen};
-
-    SwitchableSetting<bool> frame_gen_flow_scale_auto{linkage,
-                                                      true,
-                                                      "frame_gen_flow_scale_auto",
-                                                      Category::Renderer,
-                                                      Specialization::Default,
-                                                      true,
-                                                      false,
-                                                      &frame_gen};
-
-    SwitchableSetting<u32, true> frame_gen_flow_scale{linkage,
-                                                      75,
-                                                      25,
-                                                      100,
-                                                      "frame_gen_flow_scale",
-                                                      Category::Renderer,
-                                                      Specialization::Countable |
-                                                          Specialization::Percentage,
-                                                      true,
-                                                      true,
-                                                      &frame_gen};
-
-    SwitchableSetting<u32, true> frame_gen_queue_target{linkage,
-                                                        1,
-                                                        0,
-                                                        2,
-                                                        "frame_gen_queue_target",
-                                                        Category::Renderer,
-                                                        Specialization::Countable,
-                                                        true,
-                                                        false,
-                                                        &frame_gen};
-
-    SwitchableSetting<bool> frame_gen_fp16{linkage,      true,  "frame_gen_fp16", Category::Renderer,
-                                           Specialization::Default, true, false, &frame_gen};
-
-    SwitchableSetting<bool> frame_gen_dump_flow{linkage, false, "frame_gen_dump_flow",
-                                                Category::Renderer};
-
     SwitchableSetting<bool> use_asynchronous_gpu_emulation{linkage,
 #ifdef __ANDROID__
         false,
@@ -632,8 +569,13 @@ struct Values {
     SwitchableSetting<bool> emulate_bgr565{linkage, false, "emulate_bgr565",
                                             Category::RendererHacks};
 
-    SwitchableSetting<bool> rescale_hack{linkage, false, "rescale_hack",
-                                         Category::RendererHacks};
+    SwitchableSetting<bool> rescale_hack{linkage,
+#ifdef __ANDROID__
+        true,
+#else
+        false,
+#endif
+        "rescale_hack", Category::RendererHacks};
     SwitchableSetting<bool> enable_gpu_buffer_readback{linkage,
                                                        false,
                                                        "enable_gpu_buffer_readback",
@@ -933,20 +875,10 @@ struct Values {
 
     // Per-game overrides
     bool use_squashed_iterated_blend;
-
 };
 
 extern Values values;
 
-constexpr u32 MIN_FRAME_GEN_MULTIPLIER = 2;
-constexpr u32 MAX_FRAME_GEN_MULTIPLIER = 4;
-
-[[nodiscard]] u32 FrameGenMultiplier();
-
-[[nodiscard]] size_t FrameGenGenerations();
-
-[[nodiscard]] size_t FrameGenMaxGenerations();
-
 bool getDebugKnobAt(u8 i);
 
 void UpdateGPUAccuracy();

src/common/settings_enums.h

@@ -128,7 +128,7 @@ ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt
     GmtPlusZero, GmtMinusZero, GmtZero, Greenwich, Hongkong, Hst, Iceland, Iran, Israel, Jamaica,
     Japan, Kwajalein, Libya, Met, Mst, Mst7Mdt, Navajo, Nz, NzChat, Poland, Portugal, Prc, Pst8Pdt,
     Roc, Rok, Singapore, Turkey, Uct, Universal, Utc, WSu, Wet, Zulu);
-ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16);
+ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16, X32, X64, None);
 ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous);
 ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);
 ENUM(FramePacingMode, Target_Auto, Target_30, Target_60, Target_90, Target_120);

src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp

@@ -4,7 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <algorithm>
 #include <cstring>
 #include "common/assert.h"
 #include "common/logging.h"
@@ -265,7 +264,7 @@ NvResult nvhost_ctrl_gpu::ZCullGetInfo(IoctlNvgpuGpuZcullGetInfoArgs& params) {
 }
 
 NvResult nvhost_ctrl_gpu::ZBCSetTable(IoctlZbcSetTable& params) {
-    if (params.type == 0 || params.type > supported_types) {
+    if (params.type > supported_types) {
         LOG_ERROR(Service_NVDRV, "ZBCSetTable: invalid type {:#x}", params.type);
         return NvResult::BadParameter;
     }
@@ -280,61 +279,42 @@ NvResult nvhost_ctrl_gpu::ZBCSetTable(IoctlZbcSetTable& params) {
             color_entry.format = params.format;
             color_entry.ref_cnt = 1u;
 
-            const auto color_end = zbc_colors.begin() + zbc_used_color_entries;
-            auto color_it = std::find_if(zbc_colors.begin(), color_end,
-                                         [&](const ZbcColorEntry& color_in_question) {
-                                             return color_entry.format == color_in_question.format &&
-                                                    color_entry.color_ds == color_in_question.color_ds &&
-                                                    color_entry.color_l2 == color_in_question.color_l2;
-                                         });
+            auto color_it = std::ranges::find_if(zbc_colors,
+                                                 [&](const ZbcColorEntry& color_in_question) {
+                                                     return color_entry.format == color_in_question.format &&
+                                                            color_entry.color_ds == color_in_question.color_ds &&
+                                                            color_entry.color_l2 == color_in_question.color_l2;
+                                                 });
 
-            if (color_it != color_end) {
+            if (color_it != zbc_colors.end()) {
                 ++color_it->ref_cnt;
                 LOG_DEBUG(Service_NVDRV, "ZBCSetTable: reused color entry fmt={:#x}, ref_cnt={:#x}",
                           params.format, color_it->ref_cnt);
-                break;
+            } else {
+                zbc_colors.push_back(color_entry);
+                LOG_DEBUG(Service_NVDRV, "ZBCSetTable: added color entry fmt={:#x}, index={:#x}",
+                          params.format, zbc_colors.size() - 1);
             }
-
-            if (zbc_used_color_entries >= ZBC_TABLE_SIZE) {
-                LOG_WARNING(Service_NVDRV, "ZBCSetTable: color table is full, fmt={:#x}",
-                            params.format);
-                return NvResult::InsufficientMemory;
-            }
-
-            zbc_colors[zbc_used_color_entries] = color_entry;
-            LOG_DEBUG(Service_NVDRV, "ZBCSetTable: added color entry fmt={:#x}, index={:#x}",
-                      params.format, zbc_used_color_entries);
-            ++zbc_used_color_entries;
             break;
         }
         case ZBCTypes::depth: {
             ZbcDepthEntry depth_entry{params.depth, params.format, 1u};
 
-            const auto depth_end = zbc_depths.begin() + zbc_used_depth_entries;
-            auto depth_it = std::find_if(zbc_depths.begin(), depth_end,
-                                         [&](const ZbcDepthEntry& depth_entry_in_question) {
-                                             return depth_entry.format == depth_entry_in_question.format &&
-                                                    depth_entry.depth == depth_entry_in_question.depth;
-                                         });
+            auto depth_it = std::ranges::find_if(zbc_depths,
+                                                 [&](const ZbcDepthEntry& depth_entry_in_question) {
+                                                     return depth_entry.format == depth_entry_in_question.format &&
+                                                            depth_entry.depth == depth_entry_in_question.depth;
+                                                 });
 
-            if (depth_it != depth_end) {
+            if (depth_it != zbc_depths.end()) {
                 ++depth_it->ref_cnt;
                 LOG_DEBUG(Service_NVDRV, "ZBCSetTable: reused depth entry fmt={:#x}, ref_cnt={:#x}",
                           depth_entry.format, depth_it->ref_cnt);
-                break;
+            } else {
+                zbc_depths.push_back(depth_entry);
+                LOG_DEBUG(Service_NVDRV, "ZBCSetTable: added depth entry fmt={:#x}, index={:#x}",
+                          depth_entry.format, zbc_depths.size() - 1);
             }
-
-            if (zbc_used_depth_entries >= ZBC_TABLE_SIZE) {
-                LOG_WARNING(Service_NVDRV, "ZBCSetTable: depth table is full, fmt={:#x}",
-                            depth_entry.format);
-                return NvResult::InsufficientMemory;
-            }
-
-            zbc_depths[zbc_used_depth_entries] = depth_entry;
-            LOG_DEBUG(Service_NVDRV, "ZBCSetTable: added depth entry fmt={:#x}, index={:#x}",
-                      depth_entry.format, zbc_used_depth_entries);
-            ++zbc_used_depth_entries;
-            break;
         }
     }
 
@@ -349,16 +329,10 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(IoctlZbcQueryTable& params) {
 
     std::scoped_lock lk(zbc_mutex);
 
-    if (params.type == 0) {
-        params.index_size = ZBC_TABLE_SIZE;
-        return NvResult::Success;
-    }
-
     switch (static_cast<ZBCTypes>(params.type)) {
         case ZBCTypes::color: {
-            if (params.index_size >= zbc_used_color_entries) {
-                LOG_ERROR(Service_NVDRV, "ZBCQueryTable: invalid color index {:#x}",
-                          params.index_size);
+            if (params.index_size >= zbc_colors.size()) {
+                LOG_ERROR(Service_NVDRV, "ZBCQueryTable: invalid color index {:#x}", params.index_size);
                 return NvResult::BadParameter;
             }
 
@@ -368,13 +342,12 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(IoctlZbcQueryTable& params) {
             params.depth = 0;
             params.ref_cnt = colors.ref_cnt;
             params.format = colors.format;
-            params.index_size = zbc_used_color_entries;
+            params.index_size = static_cast<u32>(zbc_colors.size());
             break;
         }
         case ZBCTypes::depth: {
-            if (params.index_size >= zbc_used_depth_entries) {
-                LOG_ERROR(Service_NVDRV, "ZBCQueryTable: invalid depth index {:#x}",
-                          params.index_size);
+            if (params.index_size >= zbc_depths.size()) {
+                LOG_ERROR(Service_NVDRV, "ZBCQueryTable: invalid depth index {:#x}", params.index_size);
                 return NvResult::BadParameter;
             }
 
@@ -384,8 +357,7 @@ NvResult nvhost_ctrl_gpu::ZBCQueryTable(IoctlZbcQueryTable& params) {
             params.depth = depth_entry.depth;
             params.ref_cnt = depth_entry.ref_cnt;
             params.format = depth_entry.format;
-            params.index_size = zbc_used_depth_entries;
-            break;
+            params.index_size = static_cast<u32>(zbc_depths.size());
         }
     }
 

src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <array>
+#include <vector>
 
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -212,14 +212,10 @@ private:
     Kernel::KEvent* unknown_event;
 
     // ZBC Tables
-    static constexpr u32 ZBC_TABLE_SIZE = 15u;
-    static constexpr u32 supported_types = 2u;
-
     std::mutex zbc_mutex{};
-    std::array<ZbcColorEntry, ZBC_TABLE_SIZE> zbc_colors{};
-    std::array<ZbcDepthEntry, ZBC_TABLE_SIZE> zbc_depths{};
-    u32 zbc_used_color_entries{};
-    u32 zbc_used_depth_entries{};
+    std::vector<ZbcColorEntry> zbc_colors{};
+    std::vector<ZbcDepthEntry> zbc_depths{};
+    const u32 supported_types = 2u;
 };
 
 } // namespace Service::Nvidia::Devices

src/core/hle/service/vi/application_display_service.cpp

@@ -88,10 +88,25 @@ Result IApplicationDisplayService::GetIndirectDisplayTransactionService(
 }
 
 Result IApplicationDisplayService::OpenDisplay(Out<u64> out_display_id, DisplayName display_name) {
+    LOG_DEBUG(Service_VI, "called with display_name={}", display_name.data());
+
     // Ensure the display name is null-terminated
     display_name[display_name.size() - 1] = '\0';
 
-    LOG_DEBUG(Service_VI, "called with display_name={}", display_name.data());
+    // According to switchbrew, only "Default", "External", "Edid", "Internal" and "Null" are valid
+    const std::array<std::string_view, 5> valid_names = {
+        "Default", "External", "Edid", "Internal", "Null"
+    };
+
+    bool valid_name = false;
+    for (const auto& name : valid_names) {
+        if (name == display_name.data()) {
+            valid_name = true;
+            break;
+        }
+    }
+
+    R_UNLESS(valid_name, ResultOperationFailed);
 
     R_RETURN(m_container->OpenDisplay(out_display_id, display_name));
 }

src/dedicated_room/CMakeLists.txt

@@ -1,27 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-FileCopyrightText: 2017 Citra Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-add_library(yuzu-room STATIC EXCLUDE_FROM_ALL
-    yuzu_room.cpp
-    yuzu_room.h
-    yuzu_room.rc)
-
-target_link_libraries(yuzu-room PRIVATE common network)
-if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(yuzu-room PRIVATE ENABLE_WEB_SERVICE)
-    target_link_libraries(yuzu-room PRIVATE web_service)
-endif()
-
-target_link_libraries(yuzu-room PRIVATE
-    OpenSSL::SSL
-    OpenSSL::Crypto)
-
-if (MSVC)
-    target_link_libraries(yuzu-room PRIVATE getopt)
-endif()
-target_link_libraries(yuzu-room PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
-
-create_target_directory_groups(yuzu-room)

src/dedicated_room/yuzu_room.cpp

@@ -1,394 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// SPDX-FileCopyrightText: Copyright yuzu/Citra Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <chrono>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <regex>
-#include <string>
-#include <thread>
-
-#ifdef _WIN32
-// windows.h needs to be included before shellapi.h
-#include <windows.h>
-
-#include <shellapi.h>
-#endif
-
-#include <openssl/evp.h>
-#include "common/common_types.h"
-#include "common/fs/file.h"
-#include "common/fs/fs.h"
-#include "common/fs/path_util.h"
-#include "common/logging.h"
-#include "common/scm_rev.h"
-#include "common/settings.h"
-#include "common/string_util.h"
-#include "core/core.h"
-#include "network/announce_multiplayer_session.h"
-#include "network/network.h"
-#include "network/room.h"
-#include "network/verify_user.h"
-
-#ifdef ENABLE_WEB_SERVICE
-#include "web_service/verify_user_jwt.h"
-#endif
-
-#undef _UNICODE
-#include <getopt.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-
-#include "yuzu_room.h"
-
-static void PrintHelp(const char* argv0) {
-    LOG_INFO(Network,
-             "Usage: {}"
-             " [options] <filename>\n"
-             "-n, --room-name         The name of the room\n"
-             "-d, --room-description  The room description\n"
-             "-s, --bind-address      The bind address for the room\n"
-             "-p, --port              The port used for the room\n"
-             "-m, --max-members       The maximum number of players for this room\n"
-             "-w, --password          The password for the room\n"
-             "-g, --preferred-game    The preferred game for this room\n"
-             "-i, --preferred-game-id The preferred game-id for this room\n"
-             "-u, --username          The username used for announce\n"
-             "-t, --token             The token used for announce\n"
-             "-a, --web-api-url       yuzu Web API url\n"
-             "-b, --ban-list-file     The file for storing the room ban list\n"
-             "-l, --log-file          The file for storing the room log\n"
-             "-h, --help              Display this help and exit\n"
-             "-v, --version           Output version information and exit\n",
-             argv0);
-}
-
-static void PrintVersion() {
-    LOG_INFO(Network, "Eden dedicated room {} {} Libnetwork: {}", Common::g_scm_branch,
-             Common::g_scm_desc, Network::network_version);
-}
-
-/// The magic text at the beginning of a yuzu-room ban list file.
-static constexpr char BanListMagic[] = "YuzuRoom-BanList-1";
-
-static constexpr char token_delimiter{':'};
-
-static void PadToken(std::string& token) {
-    std::array<unsigned char, 512> output{};
-    std::array<unsigned char, 2048> roundtrip{};
-    for (size_t i = 0; i < 3; i++) {
-        EVP_DecodeBlock(output.data(), reinterpret_cast<const unsigned char*>(token.c_str()), token.size());
-        EVP_EncodeBlock(output.data(), roundtrip.data(), roundtrip.size());
-        if (memcmp(roundtrip.data(), token.data(), token.size()) == 0) {
-            break;
-        }
-        token.push_back('=');
-    }
-}
-
-static std::string UsernameFromDisplayToken(const std::string& display_token) {
-    std::size_t outlen = 4 * ((display_token.length() + 2) / 3);
-    std::array<unsigned char, 512> output{};
-    EVP_DecodeBlock(output.data(), reinterpret_cast<const unsigned char*>(display_token.c_str()), display_token.length());
-    std::string decoded_display_token(reinterpret_cast<char*>(&output), outlen);
-    return decoded_display_token.substr(0, decoded_display_token.find(token_delimiter));
-}
-
-static std::string TokenFromDisplayToken(const std::string& display_token) {
-    std::size_t outlen = 4 * ((display_token.length() + 2) / 3);
-    std::array<unsigned char, 512> output{};
-    EVP_DecodeBlock(output.data(), reinterpret_cast<const unsigned char*>(display_token.c_str()), display_token.length());
-    std::string decoded_display_token(reinterpret_cast<char*>(&output), outlen);
-    return decoded_display_token.substr(decoded_display_token.find(token_delimiter) + 1);
-}
-
-static Network::Room::BanList LoadBanList(const std::string& path) {
-    std::ifstream file;
-    Common::FS::OpenFileStream(file, path, std::ios_base::in);
-    if (!file || file.eof()) {
-        LOG_ERROR(Network, "Could not open ban list!");
-        return {};
-    }
-    std::string magic;
-    std::getline(file, magic);
-    if (magic != BanListMagic) {
-        LOG_ERROR(Network, "Ban list is not valid!");
-        return {};
-    }
-
-    // false = username ban list, true = ip ban list
-    bool ban_list_type = false;
-    Network::Room::UsernameBanList username_ban_list;
-    Network::Room::IPBanList ip_ban_list;
-    while (!file.eof()) {
-        std::string line;
-        std::getline(file, line);
-        line.erase(std::remove(line.begin(), line.end(), '\0'), line.end());
-        line = Common::StripSpaces(line);
-        if (line.empty()) {
-            // An empty line marks start of the IP ban list
-            ban_list_type = true;
-            continue;
-        }
-        if (ban_list_type) {
-            ip_ban_list.emplace_back(line);
-        } else {
-            username_ban_list.emplace_back(line);
-        }
-    }
-
-    return {username_ban_list, ip_ban_list};
-}
-
-static void SaveBanList(const Network::Room::BanList& ban_list, const std::string& path) {
-    std::ofstream file;
-    Common::FS::OpenFileStream(file, path, std::ios_base::out);
-    if (!file) {
-        LOG_ERROR(Network, "Could not save ban list!");
-        return;
-    }
-
-    file << BanListMagic << "\n";
-
-    // Username ban list
-    for (const auto& username : ban_list.first) {
-        file << username << "\n";
-    }
-    file << "\n";
-
-    // IP ban list
-    for (const auto& ip : ban_list.second) {
-        file << ip << "\n";
-    }
-}
-
-/// Application entry point
-void LaunchRoom(int argc, char** argv, bool called_by_option) {
-    int option_index = 0;
-    char* endarg;
-
-    char* new_argv0 = argv[0];
-    if (called_by_option) {
-        strncat(new_argv0, " --room", 8);
-    }
-
-    std::string room_name;
-    std::string room_description;
-    std::string password;
-    std::string preferred_game;
-    std::string username;
-    std::string token;
-    std::string web_api_url;
-    std::string ban_list_file;
-    std::string log_file = "eden-room.log";
-    std::string bind_address;
-    u64 preferred_game_id = 0;
-    u32 port = Network::DefaultRoomPort;
-    u32 max_members = 16;
-
-    static struct option long_options[] = {
-        {"room-name", required_argument, 0, 'n'},
-        {"room-description", required_argument, 0, 'd'},
-        {"bind-address", required_argument, 0, 's'},
-        {"port", required_argument, 0, 'p'},
-        {"max-members", required_argument, 0, 'm'},
-        {"password", required_argument, 0, 'w'},
-        {"preferred-game", required_argument, 0, 'g'},
-        {"preferred-game-id", required_argument, 0, 'i'},
-        {"username", optional_argument, 0, 'u'},
-        {"token", required_argument, 0, 't'},
-        {"web-api-url", required_argument, 0, 'a'},
-        {"ban-list-file", required_argument, 0, 'b'},
-        {"log-file", required_argument, 0, 'l'},
-        {"help", no_argument, 0, 'h'},
-        {"version", no_argument, 0, 'v'},
-        // Entry option
-        {"room", 0, 0, 0},
-        {0, 0, 0, 0},
-    };
-
-    Common::Log::Initialize();
-    Common::Log::SetColorConsoleBackendEnabled(true);
-    Common::Log::Start();
-
-    while (optind < argc) {
-        int arg = getopt_long(argc, argv, "n:d:s:p:m:w:g:u:t:a:i:l:hv", long_options, &option_index);
-        if (arg != -1) {
-            char carg = static_cast<char>(arg);
-
-            switch (carg) {
-            case 'n':
-                room_name.assign(optarg);
-                break;
-            case 'd':
-                room_description.assign(optarg);
-                break;
-            case 's':
-                bind_address.assign(optarg);
-                break;
-            case 'p':
-                port = strtoul(optarg, &endarg, 0);
-                break;
-            case 'm':
-                max_members = strtoul(optarg, &endarg, 0);
-                break;
-            case 'w':
-                password.assign(optarg);
-                break;
-            case 'g':
-                preferred_game.assign(optarg);
-                break;
-            case 'i':
-                preferred_game_id = strtoull(optarg, &endarg, 16);
-                break;
-            case 'u':
-                username.assign(optarg);
-                break;
-            case 't':
-                token.assign(optarg);
-                break;
-            case 'a':
-                web_api_url.assign(optarg);
-                break;
-            case 'b':
-                ban_list_file.assign(optarg);
-                break;
-            case 'l':
-                log_file.assign(optarg);
-                break;
-            case 'h':
-                PrintHelp(argv[0]);
-                std::exit(0);
-            case 'v':
-                PrintVersion();
-                std::exit(0);
-            default:
-                break;
-            }
-        }
-    }
-
-    if (room_name.empty()) {
-        LOG_ERROR(Network, "Room name is empty!");
-        PrintHelp(argv[0]);
-        std::exit(-1);
-    }
-    if (preferred_game.empty()) {
-        LOG_ERROR(Network, "Preferred game is empty!");
-        PrintHelp(argv[0]);
-        std::exit(-1);
-    }
-    if (preferred_game_id == 0) {
-        LOG_ERROR(Network,
-                  "preferred-game-id not set!\nThis should get set to allow users to find your "
-                  "room.\nSet with --preferred-game-id id");
-    }
-    if (max_members > Network::MaxConcurrentConnections || max_members < 2) {
-        LOG_ERROR(Network,
-                  "max_members needs to be in the range 2 - {}!",
-                  Network::MaxConcurrentConnections);
-        PrintHelp(argv[0]);
-        std::exit(-1);
-    }
-    if (bind_address.empty()) {
-        LOG_INFO(Network, "Bind address is empty: defaulting to 0.0.0.0");
-    }
-    if (port > UINT16_MAX) {
-        LOG_ERROR(Network, "Port needs to be in the range 0 - 65535!");
-        PrintHelp(argv[0]);
-        std::exit(-1);
-    }
-    if (ban_list_file.empty()) {
-        LOG_ERROR(Network,
-                  "Ban list file not set!\nThis should get set to load and save room ban "
-                  "list.\nSet with --ban-list-file <file>");
-    }
-    bool announce = true;
-    if (token.empty() && announce) {
-        announce = false;
-        LOG_INFO(Network, "Token is empty: Hosting a private room");
-    }
-    if (web_api_url.empty() && announce) {
-        announce = false;
-        LOG_INFO(Network, "Endpoint url is empty: Hosting a private room");
-    }
-    if (announce) {
-        if (username.empty()) {
-            LOG_INFO(Network, "Hosting a public room");
-            Settings::values.web_api_url = web_api_url;
-            PadToken(token);
-            Settings::values.eden_username = UsernameFromDisplayToken(token);
-            username = Settings::values.eden_username.GetValue();
-            Settings::values.eden_token = TokenFromDisplayToken(token);
-        } else {
-            LOG_INFO(Network, "Hosting a public room");
-            Settings::values.web_api_url = web_api_url;
-            Settings::values.eden_username = username;
-            Settings::values.eden_token = token;
-        }
-    }
-
-    // Load the ban list
-    Network::Room::BanList ban_list;
-    if (!ban_list_file.empty()) {
-        ban_list = LoadBanList(ban_list_file);
-    }
-
-    std::unique_ptr<Network::VerifyUser::Backend> verify_backend;
-    if (announce) {
-#ifdef ENABLE_WEB_SERVICE
-        verify_backend =
-            std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue());
-#else
-        LOG_INFO(Network,
-                 "Eden Web Services is not available with this build: validation is disabled.");
-        verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
-#endif
-    } else {
-        verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
-    }
-
-    Network::Init();
-    if (auto room = Network::GetRoom().lock()) {
-        AnnounceMultiplayerRoom::GameInfo preferred_game_info{.name = preferred_game,
-                                                              .id = preferred_game_id};
-        if (!room->Create(room_name, room_description, bind_address, static_cast<u16>(port),
-                          password, max_members, username, preferred_game_info,
-                          std::move(verify_backend), ban_list)) {
-            LOG_INFO(Network, "Failed to create room: ");
-            std::exit(-1);
-        }
-        LOG_INFO(Network, "Room is open. Close with Q+Enter...");
-        auto announce_session = std::make_unique<Core::AnnounceMultiplayerSession>();
-        if (announce) {
-            announce_session->Start();
-        }
-        while (room->GetState() == Network::Room::State::Open) {
-            std::string in;
-            std::cin >> in;
-            if (in.size() > 0) {
-                break;
-            }
-            std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        }
-        if (announce) {
-            announce_session->Stop();
-        }
-        announce_session.reset();
-        // Save the ban list
-        if (!ban_list_file.empty()) {
-            SaveBanList(room->GetBanList(), ban_list_file);
-        }
-        room->Destroy();
-    }
-    Network::Shutdown();
-    std::exit(0);
-}

src/dedicated_room/yuzu_room.h

@@ -1,7 +0,0 @@
-// Copyright eden Emulator Project
-// Licensed under GPLv3 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-void LaunchRoom(int argc, char** argv, bool called_by_option);

src/dedicated_room/yuzu_room.rc

@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: 2017 Citra Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "winresrc.h"
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-YUZU_ICON              ICON                    "../../dist/eden.ico"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// RT_MANIFEST
-//
-
-0                       RT_MANIFEST             "../../dist/yuzu.manifest"

src/network/room.cpp

@@ -6,18 +6,31 @@
 #include <algorithm>
 #include <atomic>
 #include <iomanip>
+#include <iostream>
 #include <mutex>
 #include <random>
 #include <regex>
 #include <shared_mutex>
 #include <sstream>
 #include <thread>
+#include <fstream>
+
+#include <openssl/evp.h>
+
+#include "common/fs/file.h"
 #include "common/polyfill_thread.h"
 #include "common/logging.h"
+#include "common/settings.h"
+#include "common/string_util.h"
 #include "enet/enet.h"
+#include "network/announce_multiplayer_session.h"
 #include "network/packet.h"
 #include "network/room.h"
+#include "network/network.h"
 #include "network/verify_user.h"
+#ifdef ENABLE_WEB_SERVICE
+#include "web_service/verify_user_jwt.h"
+#endif
 
 namespace Network {
 
@@ -1142,4 +1155,201 @@ void Room::Destroy() {
     room_impl->room_information.name.clear();
 }
 
+#ifdef YUZU_ROOM
+/// The magic text at the beginning of a yuzu-room ban list file.
+static constexpr char BAN_LIST_MAGIC[] = "YuzuRoom-BanList-1";
+static constexpr char TOKEN_DELIMITER{':'};
+
+static void PadToken(std::string& token) {
+    std::array<unsigned char, 512> output{};
+    std::array<unsigned char, 2048> roundtrip{};
+    for (size_t i = 0; i < 3; i++) {
+        EVP_DecodeBlock(output.data(), reinterpret_cast<const unsigned char*>(token.c_str()), token.size());
+        EVP_EncodeBlock(output.data(), roundtrip.data(), roundtrip.size());
+        if (memcmp(roundtrip.data(), token.data(), token.size()) == 0) {
+            break;
+        }
+        token.push_back('=');
+    }
+}
+
+static std::string UsernameFromDisplayToken(const std::string& display_token) {
+    std::size_t outlen = 4 * ((display_token.length() + 2) / 3);
+    std::array<unsigned char, 512> output{};
+    EVP_DecodeBlock(output.data(), reinterpret_cast<const unsigned char*>(display_token.c_str()), display_token.length());
+    std::string decoded_display_token(reinterpret_cast<char*>(&output), outlen);
+    return decoded_display_token.substr(0, decoded_display_token.find(TOKEN_DELIMITER));
+}
+
+static std::string TokenFromDisplayToken(const std::string& display_token) {
+    std::size_t outlen = 4 * ((display_token.length() + 2) / 3);
+    std::array<unsigned char, 512> output{};
+    EVP_DecodeBlock(output.data(), reinterpret_cast<const unsigned char*>(display_token.c_str()), display_token.length());
+    std::string decoded_display_token(reinterpret_cast<char*>(&output), outlen);
+    return decoded_display_token.substr(decoded_display_token.find(TOKEN_DELIMITER) + 1);
+}
+
+static Network::Room::BanList LoadBanList(const std::string& path) {
+    std::ifstream file;
+    Common::FS::OpenFileStream(file, path, std::ios_base::in);
+    if (!file || file.eof()) {
+        LOG_ERROR(Network, "Could not open ban list!");
+        return {};
+    }
+    std::string magic;
+    std::getline(file, magic);
+    if (magic != BAN_LIST_MAGIC) {
+        LOG_ERROR(Network, "Ban list is not valid!");
+        return {};
+    }
+
+    // false = username ban list, true = ip ban list
+    bool ban_list_type = false;
+    Network::Room::UsernameBanList username_ban_list;
+    Network::Room::IPBanList ip_ban_list;
+    while (!file.eof()) {
+        std::string line;
+        std::getline(file, line);
+        line.erase(std::remove(line.begin(), line.end(), '\0'), line.end());
+        line = Common::StripSpaces(line);
+        if (line.empty()) {
+            // An empty line marks start of the IP ban list
+            ban_list_type = true;
+            continue;
+        }
+        if (ban_list_type) {
+            ip_ban_list.emplace_back(line);
+        } else {
+            username_ban_list.emplace_back(line);
+        }
+    }
+    return {username_ban_list, ip_ban_list};
+}
+
+static void SaveBanList(const Network::Room::BanList& ban_list, const std::string& path) {
+    std::ofstream file;
+    Common::FS::OpenFileStream(file, path, std::ios_base::out);
+    if (!file) {
+        LOG_ERROR(Network, "Could not save ban list!");
+        return;
+    }
+    file << BAN_LIST_MAGIC << "\n";
+    // Username ban list
+    for (const auto& username : ban_list.first)
+        file << username << "\n";
+    file << "\n";
+    // IP ban list
+    for (const auto& ip : ban_list.second)
+        file << ip << "\n";
+}
+
+int LaunchRoomLoopWithArguments(Common::ProgramArguments& args) {
+    if (args.room_name.empty()) {
+        LOG_ERROR(Network, "Room name is empty!");
+        return -1;
+    }
+    if (args.preferred_game.empty()) {
+        LOG_ERROR(Network, "Preferred game is empty!");
+        return -1;
+    }
+    if (args.preferred_game_id == 0) {
+        LOG_WARNING(Network,
+            "preferred-game-id not set!\n"
+            "This should get set to allow users to find your room.\n"
+            "Set with --preferred-game-id id");
+    }
+    if (args.bind_address.empty()) {
+        LOG_INFO(Network, "Bind address is empty: defaulting to 0.0.0.0");
+    }
+    if (args.ban_list_file.empty()) {
+        LOG_WARNING(Network,
+            "Ban list file not set!\n"
+            "This should get set to load and save room ban list.\n"
+            "Set with --ban-list-file <file>");
+    }
+    bool announce = true;
+    if (args.token.empty() && announce) {
+        announce = false;
+        LOG_INFO(Network, "Token is empty: Hosting a private room");
+    }
+    if (args.web_api_url.empty() && announce) {
+        announce = false;
+        LOG_INFO(Network, "Endpoint url is empty: Hosting a private room");
+    }
+    if (announce) {
+        if (args.username.empty()) {
+            LOG_INFO(Network, "Hosting a public room");
+            Settings::values.web_api_url = args.web_api_url;
+            PadToken(args.token);
+            Settings::values.eden_username = UsernameFromDisplayToken(args.token);
+            args.username = Settings::values.eden_username.GetValue();
+            Settings::values.eden_token = TokenFromDisplayToken(args.token);
+        } else {
+            LOG_INFO(Network, "Hosting a public room");
+            Settings::values.web_api_url = args.web_api_url;
+            Settings::values.eden_username = args.username;
+            Settings::values.eden_token = args.token;
+        }
+    }
+
+    // Load the ban list
+    Network::Room::BanList ban_list;
+    if (!args.ban_list_file.empty()) {
+        ban_list = LoadBanList(args.ban_list_file);
+    }
+
+    std::unique_ptr<Network::VerifyUser::Backend> verify_backend;
+    if (announce) {
+#ifdef ENABLE_WEB_SERVICE
+        verify_backend =
+            std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue());
+#else
+        LOG_INFO(Network,
+                 "Eden Web Services is not available with this build: validation is disabled.");
+        verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
+#endif
+    } else {
+        verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
+    }
+
+    Network::Init();
+    if (auto room = Network::GetRoom().lock()) {
+        AnnounceMultiplayerRoom::GameInfo preferred_game_info{
+            .name = args.preferred_game,
+            .id = args.preferred_game_id
+        };
+        if (!room->Create(args.room_name, args.room_description, args.bind_address, u16(args.port),
+                          args.password, args.max_members, args.username, preferred_game_info,
+                          std::move(verify_backend), ban_list)) {
+            LOG_INFO(Network, "Failed to create room: ");
+            return -1;
+        }
+        LOG_INFO(Network, "Room is open. Close with Q+Enter...");
+        auto announce_session = std::make_unique<Core::AnnounceMultiplayerSession>();
+        if (announce) {
+            announce_session->Start();
+        }
+        while (room->GetState() == Network::Room::State::Open) {
+            std::string in;
+            std::cin >> in;
+            if (in.size() > 0) {
+                break;
+            }
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        }
+        if (announce) {
+            announce_session->Stop();
+        }
+        announce_session.reset();
+        // Save the ban list
+        if (!args.ban_list_file.empty()) {
+            SaveBanList(room->GetBanList(), args.ban_list_file);
+        }
+        room->Destroy();
+    }
+    Network::Shutdown();
+    return 0;
+}
+#endif
+
 } // namespace Network

src/network/room.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
@@ -10,6 +10,7 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include "common/program_args.h"
 #include "common/announce_multiplayer_room.h"
 #include "common/common_types.h"
 #include "common/socket_types.h"
@@ -148,4 +149,6 @@ private:
     std::unique_ptr<RoomImpl> room_impl;
 };
 
+int LaunchRoomLoopWithArguments(Common::ProgramArguments& args);
+
 } // namespace Network

src/qt_common/config/shared_translation.cpp

@@ -522,6 +522,9 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
                               PAIR(AnisotropyMode, X4, tr("4x")),
                               PAIR(AnisotropyMode, X8, tr("8x")),
                               PAIR(AnisotropyMode, X16, tr("16x")),
+                              PAIR(AnisotropyMode, X32, tr("32x")),
+                              PAIR(AnisotropyMode, X64, tr("64x")),
+                              PAIR(AnisotropyMode, None, tr("None")),
                           }});
     translations->insert(
         {Settings::EnumMetadata<Settings::Language>::Index(),

src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp

@@ -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
 
@@ -220,22 +217,6 @@ void EmitGetAttribute(EmitContext& ctx, IR::Inst& inst, IR::Attribute attr,
         ctx.AddF32("{}={}{}.{};", inst, input_decorator, ctx.position_name, swizzle);
         break;
     }
-    case IR::Attribute::ClipDistance0:
-    case IR::Attribute::ClipDistance1:
-    case IR::Attribute::ClipDistance2:
-    case IR::Attribute::ClipDistance3:
-    case IR::Attribute::ClipDistance4:
-    case IR::Attribute::ClipDistance5:
-    case IR::Attribute::ClipDistance6:
-    case IR::Attribute::ClipDistance7: {
-        const u32 index{static_cast<u32>(attr) - static_cast<u32>(IR::Attribute::ClipDistance0)};
-        if (IsInputArray(ctx.stage)) {
-            ctx.AddF32("{}=gl_in[{}].gl_ClipDistance[{}];", inst, vertex, index);
-        } else {
-            ctx.AddF32("{}=gl_ClipDistance[{}];", inst, index);
-        }
-        break;
-    }
     case IR::Attribute::PointSpriteS:
     case IR::Attribute::PointSpriteT:
         ctx.AddF32("{}=gl_PointCoord.{};", inst, swizzle);

src/shader_recompiler/backend/glsl/glsl_emit_context.cpp

@@ -306,12 +306,9 @@ EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile
         } else if (program.is_geometry_passthrough && !profile.support_geometry_shader_passthrough) {
             LOG_WARNING(Shader_GLSL, "Passthrough geometry program used but not supported");
         }
-        header += fmt::format("layout({},max_vertices={})out;in gl_PerVertex{{vec4 gl_Position;",
-                              OutputPrimitive(program.output_topology), program.output_vertices);
-        if (program.info.loads.ClipDistances()) {
-            header += "float gl_ClipDistance[];";
-        }
-        header += "}gl_in[];";
+        header += fmt::format(
+            "layout({},max_vertices={})out;in gl_PerVertex{{vec4 gl_Position;}}gl_in[];",
+            OutputPrimitive(program.output_topology), program.output_vertices);
         break;
     case Stage::Fragment:
         stage_name = "fs";

src/shader_recompiler/backend/spirv/emit_spirv.cpp

@@ -335,7 +335,7 @@ void SetupDenormControl(const Profile& profile, const IR::Program& program, Emit
     if (info.uses_fp32_denorms_flush && info.uses_fp32_denorms_preserve) {
         LOG_DEBUG(Shader_SPIRV, "Fp32 denorm flush and preserve on the same shader");
     } else if (info.uses_fp32_denorms_flush) {
-        if (profile.support_fp32_denorm_flush && !profile.has_broken_fp32_denorm_flush) {
+        if (profile.support_fp32_denorm_flush) {
             ctx.AddCapability(spv::Capability::DenormFlushToZero);
             ctx.AddExecutionMode(main_func, spv::ExecutionMode::DenormFlushToZero, 32U);
         } else {
@@ -381,8 +381,7 @@ void SetupSignedNanCapabilities(const Profile& profile, const IR::Program& progr
         ctx.AddCapability(spv::Capability::SignedZeroInfNanPreserve);
         ctx.AddExecutionMode(main_func, spv::ExecutionMode::SignedZeroInfNanPreserve, 16U);
     }
-    if (profile.support_fp32_signed_zero_nan_preserve &&
-        !profile.has_broken_fp32_signed_zero_nan_preserve) {
+    if (profile.support_fp32_signed_zero_nan_preserve) {
         ctx.AddCapability(spv::Capability::SignedZeroInfNanPreserve);
         ctx.AddExecutionMode(main_func, spv::ExecutionMode::SignedZeroInfNanPreserve, 32U);
     }

src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp

@@ -367,23 +367,6 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) {
         return ctx.OpSelect(ctx.F32[1], ctx.OpLoad(ctx.U1, ctx.front_face),
                             ctx.OpBitcast(ctx.F32[1], ctx.Const((std::numeric_limits<u32>::max)())),
                             ctx.f32_zero_value);
-    case IR::Attribute::ClipDistance0:
-    case IR::Attribute::ClipDistance1:
-    case IR::Attribute::ClipDistance2:
-    case IR::Attribute::ClipDistance3:
-    case IR::Attribute::ClipDistance4:
-    case IR::Attribute::ClipDistance5:
-    case IR::Attribute::ClipDistance6:
-    case IR::Attribute::ClipDistance7: {
-        const u32 base{static_cast<u32>(IR::Attribute::ClipDistance0)};
-        const u32 index{static_cast<u32>(attr) - base};
-        if (!ValidId(ctx.input_clip_distances) || index >= ctx.profile.max_user_clip_distances) {
-            return ctx.Const(1.0f);
-        }
-        const Id pointer{
-            AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_clip_distances, ctx.Const(index))};
-        return ctx.OpLoad(ctx.F32[1], pointer);
-    }
     case IR::Attribute::PointSpriteS:
         return ctx.OpLoad(ctx.F32[1],
                           ctx.OpAccessChain(ctx.input_f32, ctx.point_coord, ctx.u32_zero_value));

src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@@ -1522,12 +1522,6 @@ void EmitContext::DefineInputs(const IR::Program& program) {
             }
         }
     }
-    if (stage == Stage::Geometry && info.loads.ClipDistances() &&
-        profile.max_user_clip_distances > 0) {
-        const u32 used{(std::min)(profile.max_user_clip_distances, 8u)};
-        const Id type{TypeArray(F32[1], Const(used))};
-        input_clip_distances = DefineInput(*this, type, true, spv::BuiltIn::ClipDistance);
-    }
     if (loads[IR::Attribute::InstanceId]) {
         if (profile.support_vertex_instance_id) {
             instance_id = DefineInput(*this, U32[1], true, spv::BuiltIn::InstanceId);

src/shader_recompiler/backend/spirv/spirv_emit_context.h

@@ -285,7 +285,6 @@ public:
     Id point_coord{};
     Id tess_coord{};
     Id clip_distances{};
-    Id input_clip_distances{};
     Id layer{};
     Id viewport_index{};
     Id viewport_mask{};

src/shader_recompiler/frontend/maxwell/translate/impl/texture_fetch_swizzled.cpp

@@ -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
 
@@ -53,6 +50,12 @@ constexpr std::array RGBA_LUT{
     R | G | B | A, //
 };
 
+void CheckAlignment(IR::Reg reg, size_t alignment) {
+    if (!IR::IsAligned(reg, alignment)) {
+        throw NotImplementedException("Unaligned source register {}", reg);
+    }
+}
+
 template <typename... Args>
 IR::Value Composite(TranslatorVisitor& v, Args... regs) {
     return v.ir.CompositeConstruct(v.F(regs)...);
@@ -83,53 +86,67 @@ IR::Value Sample(TranslatorVisitor& v, u64 insn) {
         info.type.Assign(TextureType::Color2D);
         return v.ir.ImageSampleExplicitLod(handle, Composite(v, reg_a, reg_b), zero, {}, info);
     case 3: // 2D.LL
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::Color2D);
         return v.ir.ImageSampleExplicitLod(handle, Composite(v, reg_a, reg_a + 1), v.F(reg_b), {},
                                            info);
     case 4: // 2D.DC
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::Color2D);
         info.is_depth.Assign(1);
         return v.ir.ImageSampleDrefImplicitLod(handle, Composite(v, reg_a, reg_a + 1), v.F(reg_b),
                                                {}, {}, {}, info);
     case 5: // 2D.LL.DC
+        CheckAlignment(reg_a, 2);
+        CheckAlignment(reg_b, 2);
         info.type.Assign(TextureType::Color2D);
         info.is_depth.Assign(1);
         return v.ir.ImageSampleDrefExplicitLod(handle, Composite(v, reg_a, reg_a + 1),
                                                v.F(reg_b + 1), v.F(reg_b), {}, info);
     case 6: // 2D.LZ.DC
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::Color2D);
         info.is_depth.Assign(1);
         return v.ir.ImageSampleDrefExplicitLod(handle, Composite(v, reg_a, reg_a + 1), v.F(reg_b),
                                                zero, {}, info);
     case 7: // ARRAY_2D
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::ColorArray2D);
         return v.ir.ImageSampleImplicitLod(
             handle, v.ir.CompositeConstruct(v.F(reg_a + 1), v.F(reg_b), ReadArray(v, v.X(reg_a))),
             {}, {}, {}, info);
     case 8: // ARRAY_2D.LZ
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::ColorArray2D);
         return v.ir.ImageSampleExplicitLod(
             handle, v.ir.CompositeConstruct(v.F(reg_a + 1), v.F(reg_b), ReadArray(v, v.X(reg_a))),
             zero, {}, info);
     case 9: // ARRAY_2D.LZ.DC
+        CheckAlignment(reg_a, 2);
+        CheckAlignment(reg_b, 2);
         info.type.Assign(TextureType::ColorArray2D);
         info.is_depth.Assign(1);
         return v.ir.ImageSampleDrefExplicitLod(
             handle, v.ir.CompositeConstruct(v.F(reg_a + 1), v.F(reg_b), ReadArray(v, v.X(reg_a))),
             v.F(reg_b + 1), zero, {}, info);
     case 10: // 3D
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::Color3D);
         return v.ir.ImageSampleImplicitLod(handle, Composite(v, reg_a, reg_a + 1, reg_b), {}, {},
                                            {}, info);
     case 11: // 3D.LZ
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::Color3D);
         return v.ir.ImageSampleExplicitLod(handle, Composite(v, reg_a, reg_a + 1, reg_b), zero, {},
                                            info);
     case 12: // CUBE
+        CheckAlignment(reg_a, 2);
         info.type.Assign(TextureType::ColorCube);
         return v.ir.ImageSampleImplicitLod(handle, Composite(v, reg_a, reg_a + 1, reg_b), {}, {},
                                            {}, info);
     case 13: // CUBE.LL
+        CheckAlignment(reg_a, 2);
+        CheckAlignment(reg_b, 2);
         info.type.Assign(TextureType::ColorCube);
         return v.ir.ImageSampleExplicitLod(handle, Composite(v, reg_a, reg_a + 1, reg_b),
                                            v.F(reg_b + 1), {}, info);
@@ -170,10 +187,12 @@ IR::Reg RegStoreComponent32(u64 insn, unsigned index) {
     case 0:
         return texs.dest_reg_a;
     case 1:
+        CheckAlignment(texs.dest_reg_a, 2);
         return texs.dest_reg_a + 1;
     case 2:
         return texs.dest_reg_b;
     case 3:
+        CheckAlignment(texs.dest_reg_b, 2);
         return texs.dest_reg_b + 1;
     }
     throw LogicError("Invalid store index {}", index);

src/shader_recompiler/frontend/maxwell/translate/impl/texture_gather_swizzled.cpp

@@ -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
 
@@ -37,6 +34,12 @@ union Encoding {
     BitField<36, 13, u64> cbuf_offset;
 };
 
+void CheckAlignment(IR::Reg reg, size_t alignment) {
+    if (!IR::IsAligned(reg, alignment)) {
+        throw NotImplementedException("Unaligned source register {}", reg);
+    }
+}
+
 IR::Value MakeOffset(TranslatorVisitor& v, IR::Reg reg) {
     const IR::U32 value{v.X(reg)};
     return v.ir.CompositeConstruct(v.ir.BitFieldExtract(value, v.ir.Imm32(0), v.ir.Imm32(6), true),
@@ -57,15 +60,18 @@ IR::Value Sample(TranslatorVisitor& v, u64 insn) {
     info.is_depth.Assign(tld4s.dc != 0 ? 1 : 0);
     IR::Value coords;
     if (tld4s.aoffi != 0) {
+        CheckAlignment(reg_a, 2);
         coords = v.ir.CompositeConstruct(v.F(reg_a), v.F(reg_a + 1));
         IR::Value offset = MakeOffset(v, reg_b);
         if (tld4s.dc != 0) {
+            CheckAlignment(reg_b, 2);
             IR::F32 dref = v.F(reg_b + 1);
             return v.ir.ImageGatherDref(handle, coords, offset, {}, dref, info);
         }
         return v.ir.ImageGather(handle, coords, offset, {}, info);
     }
     if (tld4s.dc != 0) {
+        CheckAlignment(reg_a, 2);
         coords = v.ir.CompositeConstruct(v.F(reg_a), v.F(reg_a + 1));
         IR::F32 dref = v.F(reg_b);
         return v.ir.ImageGatherDref(handle, coords, {}, {}, dref, info);
@@ -80,10 +86,12 @@ IR::Reg RegStoreComponent32(u64 insn, size_t index) {
     case 0:
         return tlds4.dest_reg_a;
     case 1:
+        CheckAlignment(tlds4.dest_reg_a, 2);
         return tlds4.dest_reg_a + 1;
     case 2:
         return tlds4.dest_reg_b;
     case 3:
+        CheckAlignment(tlds4.dest_reg_b, 2);
         return tlds4.dest_reg_b + 1;
     }
     throw LogicError("Invalid store index {}", index);

src/shader_recompiler/frontend/maxwell/translate/impl/texture_load_swizzled.cpp

@@ -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
 
@@ -58,6 +55,12 @@ union Encoding {
     BitField<53, 4, u64> encoding;
 };
 
+void CheckAlignment(IR::Reg reg, size_t alignment) {
+    if (!IR::IsAligned(reg, alignment)) {
+        throw NotImplementedException("Unaligned source register {}", reg);
+    }
+}
+
 IR::Value MakeOffset(TranslatorVisitor& v, IR::Reg reg) {
     const IR::U32 value{v.X(reg)};
     return v.ir.CompositeConstruct(v.ir.BitFieldExtract(value, v.ir.Imm32(0), v.ir.Imm32(4), true),
@@ -89,31 +92,38 @@ IR::Value Sample(TranslatorVisitor& v, u64 insn) {
         coords = v.ir.CompositeConstruct(v.X(reg_a), v.X(reg_b));
         break;
     case 4:
+        CheckAlignment(reg_a, 2);
         texture_type = Shader::TextureType::Color2D;
         coords = v.ir.CompositeConstruct(v.X(reg_a), v.X(reg_a + 1));
         offsets = MakeOffset(v, reg_b);
         break;
     case 5:
+        CheckAlignment(reg_a, 2);
         texture_type = Shader::TextureType::Color2D;
         coords = v.ir.CompositeConstruct(v.X(reg_a), v.X(reg_a + 1));
         lod = v.X(reg_b);
         break;
     case 6:
+        CheckAlignment(reg_a, 2);
         texture_type = Shader::TextureType::Color2D;
         coords = v.ir.CompositeConstruct(v.X(reg_a), v.X(reg_a + 1));
         multisample = v.X(reg_b);
         break;
     case 7:
+        CheckAlignment(reg_a, 2);
         texture_type = Shader::TextureType::Color3D;
         coords = v.ir.CompositeConstruct(v.X(reg_a), v.X(reg_a + 1), v.X(reg_b));
         break;
     case 8: {
+        CheckAlignment(reg_b, 2);
         const IR::U32 array{v.ir.BitFieldExtract(v.X(reg_a), v.ir.Imm32(0), v.ir.Imm32(16))};
         texture_type = Shader::TextureType::ColorArray2D;
         coords = v.ir.CompositeConstruct(v.X(reg_b), v.X(reg_b + 1), array);
         break;
     }
     case 12:
+        CheckAlignment(reg_a, 2);
+        CheckAlignment(reg_b, 2);
         texture_type = Shader::TextureType::Color2D;
         coords = v.ir.CompositeConstruct(v.X(reg_a), v.X(reg_a + 1));
         lod = v.X(reg_b);
@@ -156,10 +166,12 @@ IR::Reg RegStoreComponent32(u64 insn, unsigned index) {
     case 0:
         return tlds.dest_reg_a;
     case 1:
+        CheckAlignment(tlds.dest_reg_a, 2);
         return tlds.dest_reg_a + 1;
     case 2:
         return tlds.dest_reg_b;
     case 3:
+        CheckAlignment(tlds.dest_reg_b, 2);
         return tlds.dest_reg_b + 1;
     }
     throw LogicError("Invalid store index {}", index);

src/shader_recompiler/frontend/maxwell/translate_program.cpp

@@ -144,15 +144,12 @@ std::map<IR::Attribute, IR::Attribute> GenerateLegacyToGenericMappings(
             for (size_t i = 0; i < count; ++i) {
                 mapping.insert({attr + i, previous_stage_mapping.at(attr + i)});
             }
-            return;
+        } else {
+            for (size_t i = 0; i < count; ++i) {
+                mapping.insert({attr + i, unused_generics.front() + i});
+            }
+            unused_generics.pop();
         }
-        if (unused_generics.empty()) {
-            return;
-        }
-        for (size_t i = 0; i < count; ++i) {
-            mapping.insert({attr + i, unused_generics.front() + i});
-        }
-        unused_generics.pop();
     };
     for (size_t index = 0; index < 4; ++index) {
         auto attr = IR::Attribute::ColorFrontDiffuseR + index * 4;
@@ -172,98 +169,31 @@ std::map<IR::Attribute, IR::Attribute> GenerateLegacyToGenericMappings(
     return mapping;
 }
 
-struct PassthroughVertices {
-    u32 count;
-    u32 first;
-    u32 stride;
-};
-
-OutputTopology GetPassthroughTopology(InputTopology input_topology) {
-    switch (input_topology) {
-    case InputTopology::Points:
-        return OutputTopology::PointList;
-    case InputTopology::Lines:
-    case InputTopology::LinesAdjacency:
-        return OutputTopology::LineStrip;
-    case InputTopology::Triangles:
-    case InputTopology::TrianglesAdjacency:
-        return OutputTopology::TriangleStrip;
-    }
-    return OutputTopology::TriangleStrip;
-}
-
-PassthroughVertices GetPassthroughVertices(InputTopology input_topology) {
-    switch (input_topology) {
-    case InputTopology::Points:
-        return {1, 0, 1};
-    case InputTopology::Lines:
-        return {2, 0, 1};
-    case InputTopology::LinesAdjacency:
-        return {2, 1, 1};
-    case InputTopology::Triangles:
-        return {3, 0, 1};
-    case InputTopology::TrianglesAdjacency:
-        return {3, 0, 2};
-    }
-    return {3, 0, 1};
-}
-
 void EmitGeometryPassthrough(IR::IREmitter& ir, const IR::Program& program,
                              const Shader::VaryingState& passthrough_mask,
                              bool passthrough_position,
-                             std::optional<IR::Attribute> passthrough_layer_attr,
-                             InputTopology input_topology) {
-    const PassthroughVertices vertices{GetPassthroughVertices(input_topology)};
-    for (u32 vertex = 0; vertex < vertices.count; vertex++) {
-        const u32 i = vertices.first + vertex * vertices.stride;
-        const auto copy_vec4{[&ir, i](IR::Attribute attr) {
+                             std::optional<IR::Attribute> passthrough_layer_attr) {
+    for (u32 i = 0; i < program.output_vertices; i++) {
+        // Assign generics from input
+        for (u32 j = 0; j < 32; j++) {
+            if (!passthrough_mask.Generic(j)) {
+                continue;
+            }
+
+            const IR::Attribute attr = IR::Attribute::Generic0X + (j * 4);
             ir.SetAttribute(attr + 0, ir.GetAttribute(attr + 0, ir.Imm32(i)), ir.Imm32(0));
             ir.SetAttribute(attr + 1, ir.GetAttribute(attr + 1, ir.Imm32(i)), ir.Imm32(0));
             ir.SetAttribute(attr + 2, ir.GetAttribute(attr + 2, ir.Imm32(i)), ir.Imm32(0));
             ir.SetAttribute(attr + 3, ir.GetAttribute(attr + 3, ir.Imm32(i)), ir.Imm32(0));
-        }};
-
-        // Assign generics from input
-        for (u32 j = 0; j < IR::NUM_GENERICS; j++) {
-            if (!passthrough_mask.Generic(j)) {
-                continue;
-            }
-            copy_vec4(IR::Attribute::Generic0X + (j * 4));
-        }
-
-        for (u32 j = 0; j < 4; j++) {
-            const IR::Attribute attr = IR::Attribute::ColorFrontDiffuseR + (j * 4);
-            if (!passthrough_mask.AnyComponent(attr)) {
-                continue;
-            }
-            copy_vec4(attr);
-        }
-
-        if (passthrough_mask[IR::Attribute::FogCoordinate]) {
-            ir.SetAttribute(IR::Attribute::FogCoordinate,
-                            ir.GetAttribute(IR::Attribute::FogCoordinate, ir.Imm32(i)),
-                            ir.Imm32(0));
-        }
-
-        for (u32 j = 0; j < IR::NUM_FIXEDFNCTEXTURE; j++) {
-            const IR::Attribute attr = IR::Attribute::FixedFncTexture0S + (j * 4);
-            if (!passthrough_mask.AnyComponent(attr)) {
-                continue;
-            }
-            copy_vec4(attr);
-        }
-
-        for (u32 j = 0; j < 8; j++) {
-            const IR::Attribute attr = IR::Attribute::ClipDistance0 + j;
-            if (!passthrough_mask[attr]) {
-                continue;
-            }
-            ir.SetAttribute(attr, ir.GetAttribute(attr, ir.Imm32(i)), ir.Imm32(0));
         }
 
         if (passthrough_position) {
             // Assign position from input
-            copy_vec4(IR::Attribute::PositionX);
+            const IR::Attribute attr = IR::Attribute::PositionX;
+            ir.SetAttribute(attr + 0, ir.GetAttribute(attr + 0, ir.Imm32(i)), ir.Imm32(0));
+            ir.SetAttribute(attr + 1, ir.GetAttribute(attr + 1, ir.Imm32(i)), ir.Imm32(0));
+            ir.SetAttribute(attr + 2, ir.GetAttribute(attr + 2, ir.Imm32(i)), ir.Imm32(0));
+            ir.SetAttribute(attr + 3, ir.GetAttribute(attr + 3, ir.Imm32(i)), ir.Imm32(0));
         }
 
         if (passthrough_layer_attr) {
@@ -278,16 +208,25 @@ void EmitGeometryPassthrough(IR::IREmitter& ir, const IR::Program& program,
     ir.EndPrimitive(ir.Imm32(0));
 }
 
-void LowerGeometryPassthrough(const IR::Program& program, const HostTranslateInfo& host_info,
-                              InputTopology input_topology) {
+u32 GetOutputTopologyVertices(OutputTopology output_topology) {
+    switch (output_topology) {
+    case OutputTopology::PointList:
+        return 1;
+    case OutputTopology::LineStrip:
+        return 2;
+    default:
+        return 3;
+    }
+}
+
+void LowerGeometryPassthrough(const IR::Program& program, const HostTranslateInfo& host_info) {
     for (IR::Block* const block : program.blocks) {
         for (IR::Inst& inst : block->Instructions()) {
             if (inst.GetOpcode() == IR::Opcode::Epilogue) {
                 IR::IREmitter ir{*block, IR::Block::InstructionList::s_iterator_to(inst)};
                 EmitGeometryPassthrough(
                     ir, program, program.info.passthrough,
-                    program.info.passthrough.AnyComponent(IR::Attribute::PositionX), {},
-                    input_topology);
+                    program.info.passthrough.AnyComponent(IR::Attribute::PositionX), {});
             }
         }
     }
@@ -296,8 +235,7 @@ void LowerGeometryPassthrough(const IR::Program& program, const HostTranslateInf
 } // Anonymous namespace
 
 IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Block>& block_pool,
-                             Environment& env, Flow::CFG& cfg, const HostTranslateInfo& host_info,
-                             InputTopology input_topology) {
+                             Environment& env, Flow::CFG& cfg, const HostTranslateInfo& host_info) {
     HostTranslateInfo normalized_host_info{host_info};
     normalized_host_info.ApplyDescriptorLimitPolicy();
 
@@ -326,10 +264,8 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo
             }
 
             if (!normalized_host_info.support_geometry_shader_passthrough) {
-                program.output_topology = GetPassthroughTopology(input_topology);
-                program.output_vertices = GetPassthroughVertices(input_topology).count;
-                LowerGeometryPassthrough(program, normalized_host_info, input_topology);
-                program.is_geometry_passthrough = false;
+                program.output_vertices = GetOutputTopologyVertices(program.output_topology);
+                LowerGeometryPassthrough(program, normalized_host_info);
             }
         }
         break;
@@ -414,52 +350,6 @@ IR::Program MergeDualVertexPrograms(IR::Program& vertex_a, IR::Program& vertex_b
     return result;
 }
 
-void PrunePassthroughStores(IR::Program& program, const VaryingState& previous_stage_stores) {
-    if (program.stage != Stage::Geometry || program.is_geometry_passthrough) {
-        return;
-    }
-    VaryingState pruned;
-    for (size_t index = 0; index < program.info.passthrough.mask.size(); ++index) {
-        if (!program.info.passthrough.mask[index] || previous_stage_stores.mask[index]) {
-            continue;
-        }
-        const IR::Attribute attr{static_cast<IR::Attribute>(index)};
-        if (attr >= IR::Attribute::PositionX && attr <= IR::Attribute::PositionW) {
-            continue;
-        }
-        pruned.mask[index] = true;
-    }
-    if (pruned.mask.none()) {
-        return;
-    }
-    const auto erase_matching{[&pruned](IR::Block* block, IR::Opcode opcode, bool skip_used) {
-        auto it{block->begin()};
-        while (it != block->end()) {
-            IR::Inst& inst{*it};
-            if (inst.GetOpcode() != opcode ||
-                !pruned.mask[static_cast<size_t>(inst.Arg(0).Attribute())]) {
-                ++it;
-                continue;
-            }
-            if (skip_used && inst.HasUses()) {
-                ++it;
-                continue;
-            }
-            inst.Invalidate();
-            it = block->Instructions().erase(it);
-        }
-    }};
-    for (IR::Block* const block : program.post_order_blocks) {
-        erase_matching(block, IR::Opcode::SetAttribute, false);
-    }
-    for (IR::Block* const block : program.post_order_blocks) {
-        erase_matching(block, IR::Opcode::GetAttribute, true);
-    }
-    program.info.stores.mask &= ~pruned.mask;
-    program.info.loads.mask &= ~pruned.mask;
-    program.info.passthrough.mask &= ~pruned.mask;
-}
-
 void ConvertLegacyToGeneric(IR::Program& program, const Shader::RuntimeInfo& runtime_info) {
     auto& stores = program.info.stores;
     if (stores.Legacy()) {
@@ -472,23 +362,19 @@ void ConvertLegacyToGeneric(IR::Program& program, const Shader::RuntimeInfo& run
         program.info.legacy_stores_mapping =
             GenerateLegacyToGenericMappings(stores, unused_output_generics, {});
         for (IR::Block* const block : program.post_order_blocks) {
-            for (auto it = block->begin(); it != block->end();) {
-                IR::Inst& inst{*it};
-                if (inst.GetOpcode() != IR::Opcode::SetAttribute ||
-                    !IsLegacyAttribute(inst.Arg(0).Attribute())) {
-                    ++it;
-                    continue;
+            for (IR::Inst& inst : block->Instructions()) {
+                switch (inst.GetOpcode()) {
+                case IR::Opcode::SetAttribute: {
+                    const auto attr = inst.Arg(0).Attribute();
+                    if (IsLegacyAttribute(attr)) {
+                        stores.Set(program.info.legacy_stores_mapping[attr], true);
+                        inst.SetArg(0, Shader::IR::Value(program.info.legacy_stores_mapping[attr]));
+                    }
+                    break;
                 }
-                const auto& mapping{program.info.legacy_stores_mapping};
-                const auto mapped{mapping.find(inst.Arg(0).Attribute())};
-                if (mapped == mapping.end()) {
-                    inst.Invalidate();
-                    it = block->Instructions().erase(it);
-                    continue;
+                default:
+                    break;
                 }
-                stores.Set(mapped->second, true);
-                inst.SetArg(0, Shader::IR::Value(mapped->second));
-                ++it;
             }
         }
     }
@@ -510,16 +396,10 @@ void ConvertLegacyToGeneric(IR::Program& program, const Shader::RuntimeInfo& run
                 switch (inst.GetOpcode()) {
                 case IR::Opcode::GetAttribute: {
                     const auto attr = inst.Arg(0).Attribute();
-                    if (!IsLegacyAttribute(attr)) {
-                        break;
+                    if (IsLegacyAttribute(attr)) {
+                        loads.Set(mappings[attr], true);
+                        inst.SetArg(0, Shader::IR::Value(mappings[attr]));
                     }
-                    const auto mapped{mappings.find(attr)};
-                    if (mapped == mappings.end()) {
-                        inst.ReplaceUsesWith(IR::Value{0.0f});
-                        break;
-                    }
-                    loads.Set(mapped->second, true);
-                    inst.SetArg(0, Shader::IR::Value(mapped->second));
                     break;
                 }
                 default:
@@ -534,12 +414,11 @@ IR::Program GenerateGeometryPassthrough(ObjectPool<IR::Inst>& inst_pool,
                                         ObjectPool<IR::Block>& block_pool,
                                         const HostTranslateInfo& host_info,
                                         IR::Program& source_program,
-                                        Shader::OutputTopology output_topology,
-                                        InputTopology input_topology) {
+                                        Shader::OutputTopology output_topology) {
     IR::Program program;
     program.stage = Stage::Geometry;
     program.output_topology = output_topology;
-    program.output_vertices = GetPassthroughVertices(input_topology).count;
+    program.output_vertices = GetOutputTopologyVertices(output_topology);
 
     program.is_geometry_passthrough = false;
     program.info.loads.mask = source_program.info.stores.mask;
@@ -554,7 +433,7 @@ IR::Program GenerateGeometryPassthrough(ObjectPool<IR::Inst>& inst_pool,
 
     IR::IREmitter ir{*current_block};
     EmitGeometryPassthrough(ir, program, program.info.stores, true,
-                            source_program.info.emulated_layer, input_topology);
+                            source_program.info.emulated_layer);
 
     IR::Block* return_block{block_pool.Create(inst_pool)};
     IR::IREmitter{*return_block}.Epilogue();

src/shader_recompiler/frontend/maxwell/translate_program.h

@@ -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
 
@@ -21,16 +18,13 @@ namespace Shader::Maxwell {
 
 [[nodiscard]] IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool,
                                            ObjectPool<IR::Block>& block_pool, Environment& env,
-                                           Flow::CFG& cfg, const HostTranslateInfo& host_info,
-                                           InputTopology input_topology);
+                                           Flow::CFG& cfg, const HostTranslateInfo& host_info);
 
 [[nodiscard]] IR::Program MergeDualVertexPrograms(IR::Program& vertex_a, IR::Program& vertex_b,
                                                   Environment& env_vertex_b);
 
 void ConvertLegacyToGeneric(IR::Program& program, const RuntimeInfo& runtime_info);
 
-void PrunePassthroughStores(IR::Program& program, const VaryingState& previous_stage_stores);
-
 // Maxwell v1 and older Nvidia cards don't support setting gl_Layer from non-geometry stages.
 // This creates a workaround by setting the layer as a generic output and creating a
 // passthrough geometry shader that reads the generic and sets the layer.
@@ -38,7 +32,6 @@ void PrunePassthroughStores(IR::Program& program, const VaryingState& previous_s
                                                       ObjectPool<IR::Block>& block_pool,
                                                       const HostTranslateInfo& host_info,
                                                       IR::Program& source_program,
-                                                      Shader::OutputTopology output_topology,
-                                                      InputTopology input_topology);
+                                                      Shader::OutputTopology output_topology);
 
 } // namespace Shader::Maxwell

src/shader_recompiler/profile.h

@@ -86,10 +86,6 @@ struct Profile {
     bool has_broken_signed_operations{};
     /// Float controls break when fp16 is enabled
     bool has_broken_fp16_float_controls{};
-    /// Forcing fp32 signed zero, Inf and NaN preservation miscompiles on some drivers
-    bool has_broken_fp32_signed_zero_nan_preserve{};
-    /// Declaring fp32 denorm flush to zero miscompiles on some drivers
-    bool has_broken_fp32_denorm_flush{};
     /// Dynamic vec4 indexing is broken on some OpenGL drivers
     bool has_gl_component_indexing_bug{};
     /// The precise type qualifier is broken in the fragment stage of some drivers

src/video_core/CMakeLists.txt

@@ -267,38 +267,6 @@ add_library(video_core STATIC
     video_core.h
 )
 
-if (ENABLE_LSFG)
-    target_sources(video_core PRIVATE
-        frame_gen/lossless_dll.cpp
-        frame_gen/lossless_dll.h
-        frame_gen/lsfg_translate.cpp
-        frame_gen/lsfg_translate.h
-        renderer_vulkan/present/frame_gen.cpp
-        renderer_vulkan/present/frame_gen.h
-        renderer_vulkan/present/frame_gen_pacer.cpp
-        renderer_vulkan/present/frame_gen_pacer.h
-        renderer_vulkan/present/lsfg_alpha.cpp
-        renderer_vulkan/present/lsfg_alpha.h
-        renderer_vulkan/present/lsfg_beta.cpp
-        renderer_vulkan/present/lsfg_beta.h
-        renderer_vulkan/present/lsfg_chain.cpp
-        renderer_vulkan/present/lsfg_chain.h
-        renderer_vulkan/present/lsfg_common.cpp
-        renderer_vulkan/present/lsfg_common.h
-        renderer_vulkan/present/lsfg_delta.cpp
-        renderer_vulkan/present/lsfg_delta.h
-        renderer_vulkan/present/lsfg_gamma.cpp
-        renderer_vulkan/present/lsfg_gamma.h
-        renderer_vulkan/present/lsfg_generate.cpp
-        renderer_vulkan/present/lsfg_generate.h
-        renderer_vulkan/present/lsfg_mipmaps.cpp
-        renderer_vulkan/present/lsfg_mipmaps.h
-        renderer_vulkan/present/lsfg_shaders.cpp
-        renderer_vulkan/present/lsfg_shaders.h
-    )
-    target_compile_definitions(video_core PUBLIC HAS_LSFG)
-endif()
-
 if (ENABLE_OPENGL)
     target_sources(video_core PRIVATE
         renderer_opengl/present/filters.cpp

src/video_core/buffer_cache/buffer_cache.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include <algorithm>
-#include <bit>
 #include <memory>
 #include <numeric>
 
@@ -810,48 +809,46 @@ void BufferCache<P>::BindHostVertexBuffers() {
 
     if (use_optimized_vertex_buffers) {
         auto& flags = maxwell3d->dirty.flags;
-        const u32 enabled_mask = enabled_vertex_buffers_mask;
-        u32 dirty_mask = 0;
-        u32 pending_mask = enabled_mask;
-        while (pending_mask != 0) {
-            const u32 index = std::countr_zero(pending_mask);
-            pending_mask &= (pending_mask - 1);
+        u32 enabled_mask = enabled_vertex_buffers_mask;
+        HostBindings<Buffer> bindings{};
+        u32 last_index = (std::numeric_limits<u32>::max)();
+        const auto flush_bindings = [&]() {
+            if (bindings.buffers.empty()) {
+                return;
+            }
+            bindings.max_index = bindings.min_index + static_cast<u32>(bindings.buffers.size());
+            runtime.BindVertexBuffers(bindings);
+            bindings = HostBindings<Buffer>{};
+            last_index = (std::numeric_limits<u32>::max)();
+        };
+        while (enabled_mask != 0) {
+            const u32 index = std::countr_zero(enabled_mask);
+            enabled_mask &= (enabled_mask - 1);
             const Binding& binding = VertexBufferSlot(index);
             Buffer& buffer = slot_buffers[binding.buffer_id];
             TouchBuffer(buffer, binding.buffer_id);
             SynchronizeBuffer(buffer, binding.device_addr, binding.size);
-            if (flags[Dirty::VertexBuffer0 + index]) {
-                dirty_mask |= 1u << index;
-            }
-        }
-        if (dirty_mask == 0) {
-            return;
-        }
-        const u32 min_index = static_cast<u32>(std::countr_zero(dirty_mask));
-        const u32 max_index = 32u - static_cast<u32>(std::countl_zero(dirty_mask));
-        HostBindings<Buffer> bindings{};
-        bindings.min_index = min_index;
-        bindings.max_index = max_index;
-        for (u32 index = min_index; index < max_index; ++index) {
-            flags[Dirty::VertexBuffer0 + index] = false;
-            const u32 stride = maxwell3d->regs.vertex_streams[index].stride;
-            if ((enabled_mask & (1u << index)) == 0) {
-                bindings.buffers.push_back(&slot_buffers[NULL_BUFFER_ID]);
-                bindings.offsets.push_back(0);
-                bindings.sizes.push_back(0);
-                bindings.strides.push_back(stride);
+            if (!flags[Dirty::VertexBuffer0 + index]) {
+                flush_bindings();
                 continue;
             }
-            const Binding& binding = VertexBufferSlot(index);
-            Buffer& buffer = slot_buffers[binding.buffer_id];
+            flags[Dirty::VertexBuffer0 + index] = false;
+            const u32 stride = maxwell3d->regs.vertex_streams[index].stride;
             const u32 offset = buffer.Offset(binding.device_addr);
             buffer.MarkUsage(offset, binding.size);
+            if (!bindings.buffers.empty() && index != last_index + 1) {
+                flush_bindings();
+            }
+            if (bindings.buffers.empty()) {
+                bindings.min_index = index;
+            }
             bindings.buffers.push_back(&buffer);
             bindings.offsets.push_back(offset);
             bindings.sizes.push_back(binding.size);
             bindings.strides.push_back(stride);
+            last_index = index;
         }
-        runtime.BindVertexBuffers(bindings);
+        flush_bindings();
     } else {
         HostBindings<typename P::Buffer> host_bindings;
         bool any_valid{false};

src/video_core/frame_gen/lossless_dll.cpp

@@ -1,553 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <algorithm>
-#include <cstring>
-#include <optional>
-#include <span>
-
-#include "common/cityhash.h"
-#include "common/fs/file.h"
-#include "common/fs/fs.h"
-#include "common/fs/fs_paths.h"
-#include "common/fs/path_util.h"
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/frame_gen/lsfg_translate.h"
-
-namespace VideoCore::FrameGen {
-
-namespace {
-
-constexpr u16 DOS_MAGIC = 0x5A4D;
-constexpr u32 PE_SIGNATURE = 0x00004550;
-constexpr u16 PE32_MAGIC = 0x010B;
-constexpr u16 PE32_PLUS_MAGIC = 0x020B;
-
-constexpr size_t DOS_LFANEW_OFFSET = 0x3C;
-constexpr size_t COFF_HEADER_SIZE = 20;
-constexpr size_t OPTIONAL_HEADER_SIZE_OFFSET = 16;
-constexpr size_t SECTION_HEADER_SIZE = 40;
-constexpr size_t DATA_DIRECTORY_ENTRY_SIZE = 8;
-constexpr size_t DATA_DIRECTORY_OFFSET_PE32 = 96;
-constexpr size_t DATA_DIRECTORY_OFFSET_PE32_PLUS = 112;
-constexpr size_t RESOURCE_DATA_DIRECTORY_INDEX = 2;
-
-constexpr size_t RESOURCE_DIRECTORY_SIZE = 16;
-constexpr size_t RESOURCE_NAMED_COUNT_OFFSET = 12;
-constexpr size_t RESOURCE_ID_COUNT_OFFSET = 14;
-constexpr size_t RESOURCE_ENTRY_SIZE = 8;
-constexpr u32 RESOURCE_SUBDIRECTORY_FLAG = 0x80000000;
-constexpr u32 RESOURCE_TYPE_RCDATA = 10;
-
-constexpr u32 MIPMAPS_SHADER_ID = 255;
-constexpr u32 GENERATE_SHADER_ID = 256;
-constexpr u32 PERFORMANCE_SHADER_ID_FIRST = 280;
-constexpr u32 PERFORMANCE_SHADER_ID_LAST = 302;
-
-constexpr u32 CACHE_MAGIC = 0x4746534C;
-constexpr u32 CACHE_VERSION = 2;
-
-struct CacheHeader {
-    u32 magic;
-    u32 version;
-    u64 source_size;
-    u64 source_hash;
-    u32 module_count;
-    u32 variant;
-};
-
-struct Section {
-    u32 virtual_address;
-    u32 virtual_size;
-    u32 raw_address;
-    u32 raw_size;
-};
-
-struct ResourceEntry {
-    u32 id;
-    u32 offset;
-    bool is_directory;
-    bool is_named;
-};
-
-class ImageReader {
-public:
-    explicit ImageReader(std::span<const u8> image_) : image{image_} {}
-
-    template <typename T>
-    [[nodiscard]] bool Read(size_t offset, T& out_value) const {
-        if (offset > image.size() || image.size() - offset < sizeof(T)) {
-            return false;
-        }
-        std::memcpy(&out_value, image.data() + offset, sizeof(T));
-        return true;
-    }
-
-    [[nodiscard]] bool Slice(size_t offset, size_t size, std::span<const u8>& out_slice) const {
-        if (offset > image.size() || image.size() - offset < size) {
-            return false;
-        }
-        out_slice = image.subspan(offset, size);
-        return true;
-    }
-
-private:
-    std::span<const u8> image;
-};
-
-[[nodiscard]] std::optional<size_t> FindPeHeader(const ImageReader& reader) {
-    u16 dos_magic{};
-    if (!reader.Read(0, dos_magic) || dos_magic != DOS_MAGIC) {
-        return std::nullopt;
-    }
-
-    u32 pe_offset{};
-    if (!reader.Read(DOS_LFANEW_OFFSET, pe_offset)) {
-        return std::nullopt;
-    }
-
-    u32 pe_signature{};
-    if (!reader.Read(pe_offset, pe_signature) || pe_signature != PE_SIGNATURE) {
-        return std::nullopt;
-    }
-
-    return static_cast<size_t>(pe_offset);
-}
-
-[[nodiscard]] std::optional<size_t> FindDataDirectory(const ImageReader& reader,
-                                                      size_t optional_header_offset) {
-    u16 optional_magic{};
-    if (!reader.Read(optional_header_offset, optional_magic)) {
-        return std::nullopt;
-    }
-
-    switch (optional_magic) {
-    case PE32_MAGIC:
-        return optional_header_offset + DATA_DIRECTORY_OFFSET_PE32;
-    case PE32_PLUS_MAGIC:
-        return optional_header_offset + DATA_DIRECTORY_OFFSET_PE32_PLUS;
-    default:
-        return std::nullopt;
-    }
-}
-
-[[nodiscard]] bool ReadSections(const ImageReader& reader, size_t pe_offset,
-                                std::vector<Section>& out_sections) {
-    u16 section_count{};
-    u16 optional_header_size{};
-    if (!reader.Read(pe_offset + 4 + 2, section_count) ||
-        !reader.Read(pe_offset + 4 + OPTIONAL_HEADER_SIZE_OFFSET, optional_header_size)) {
-        return false;
-    }
-
-    const size_t table_offset = pe_offset + 4 + COFF_HEADER_SIZE + optional_header_size;
-    out_sections.reserve(section_count);
-    for (size_t i = 0; i < section_count; ++i) {
-        const size_t offset = table_offset + i * SECTION_HEADER_SIZE;
-        Section section{};
-        if (!reader.Read(offset + 8, section.virtual_size) ||
-            !reader.Read(offset + 12, section.virtual_address) ||
-            !reader.Read(offset + 16, section.raw_size) ||
-            !reader.Read(offset + 20, section.raw_address)) {
-            return false;
-        }
-        out_sections.push_back(section);
-    }
-    return true;
-}
-
-[[nodiscard]] std::optional<size_t> RvaToFileOffset(std::span<const Section> sections, u32 rva) {
-    for (const Section& section : sections) {
-        const u32 span = std::max(section.virtual_size, section.raw_size);
-        if (span == 0 || rva < section.virtual_address) {
-            continue;
-        }
-        const u32 relative = rva - section.virtual_address;
-        if (relative < span) {
-            return static_cast<size_t>(section.raw_address) + relative;
-        }
-    }
-    return std::nullopt;
-}
-
-[[nodiscard]] bool ReadResourceEntries(const ImageReader& reader, size_t directory_offset,
-                                       std::vector<ResourceEntry>& out_entries) {
-    u16 named_count{};
-    u16 id_count{};
-    if (!reader.Read(directory_offset + RESOURCE_NAMED_COUNT_OFFSET, named_count) ||
-        !reader.Read(directory_offset + RESOURCE_ID_COUNT_OFFSET, id_count)) {
-        return false;
-    }
-
-    const size_t total = size_t{named_count} + size_t{id_count};
-    out_entries.clear();
-    out_entries.reserve(total);
-    for (size_t i = 0; i < total; ++i) {
-        const size_t offset = directory_offset + RESOURCE_DIRECTORY_SIZE + i * RESOURCE_ENTRY_SIZE;
-        u32 name{};
-        u32 data{};
-        if (!reader.Read(offset, name) || !reader.Read(offset + 4, data)) {
-            return false;
-        }
-        out_entries.push_back(ResourceEntry{
-            .id = name & ~RESOURCE_SUBDIRECTORY_FLAG,
-            .offset = data & ~RESOURCE_SUBDIRECTORY_FLAG,
-            .is_directory = (data & RESOURCE_SUBDIRECTORY_FLAG) != 0,
-            .is_named = (name & RESOURCE_SUBDIRECTORY_FLAG) != 0,
-        });
-    }
-    return true;
-}
-
-[[nodiscard]] bool ReadResourceLeaf(const ImageReader& reader, std::span<const Section> sections,
-                                    size_t leaf_offset, std::span<const u8>& out_data) {
-    u32 data_rva{};
-    u32 data_size{};
-    if (!reader.Read(leaf_offset, data_rva) || !reader.Read(leaf_offset + 4, data_size) ||
-        data_size == 0) {
-        return false;
-    }
-
-    const std::optional<size_t> data_offset = RvaToFileOffset(sections, data_rva);
-    if (!data_offset) {
-        return false;
-    }
-    return reader.Slice(*data_offset, data_size, out_data);
-}
-
-using ResourceSpans = std::map<u32, std::span<const u8>>;
-
-[[nodiscard]] bool CollectRcData(const ImageReader& reader, std::span<const Section> sections,
-                                 size_t resource_base, ResourceSpans& out_resources) {
-    std::vector<ResourceEntry> type_entries;
-    if (!ReadResourceEntries(reader, resource_base, type_entries)) {
-        return false;
-    }
-
-    for (const ResourceEntry& type_entry : type_entries) {
-        if (type_entry.is_named || type_entry.id != RESOURCE_TYPE_RCDATA ||
-            !type_entry.is_directory) {
-            continue;
-        }
-
-        std::vector<ResourceEntry> name_entries;
-        if (!ReadResourceEntries(reader, resource_base + type_entry.offset, name_entries)) {
-            return false;
-        }
-
-        for (const ResourceEntry& name_entry : name_entries) {
-            if (name_entry.is_named || !name_entry.is_directory) {
-                continue;
-            }
-
-            std::vector<ResourceEntry> language_entries;
-            if (!ReadResourceEntries(reader, resource_base + name_entry.offset, language_entries)) {
-                return false;
-            }
-
-            for (const ResourceEntry& language_entry : language_entries) {
-                if (language_entry.is_directory) {
-                    continue;
-                }
-                std::span<const u8> data;
-                if (!ReadResourceLeaf(reader, sections, resource_base + language_entry.offset,
-                                      data)) {
-                    continue;
-                }
-                out_resources.insert_or_assign(name_entry.id, data);
-                break;
-            }
-        }
-    }
-
-    return true;
-}
-
-[[nodiscard]] std::vector<u32> PerformanceShaderIds() {
-    std::vector<u32> ids{MIPMAPS_SHADER_ID, GENERATE_SHADER_ID};
-    for (u32 id = PERFORMANCE_SHADER_ID_FIRST; id <= PERFORMANCE_SHADER_ID_LAST; ++id) {
-        ids.push_back(id);
-    }
-    return ids;
-}
-
-template <typename Map>
-[[nodiscard]] bool HasPerformanceShaders(const Map& resources) {
-    const std::vector<u32> ids = PerformanceShaderIds();
-    return std::ranges::all_of(ids, [&](u32 id) { return resources.contains(id); });
-}
-
-[[nodiscard]] u32 VariantOffset(ShaderVariant variant) {
-    return variant == ShaderVariant::NativeFp16 ? PerformanceShader::NATIVE_FP16_OFFSET
-                                                : PerformanceShader::NATIVE_FP32_OFFSET;
-}
-
-template <typename Map>
-[[nodiscard]] bool HasNativeVariant(const Map& resources, ShaderVariant variant) {
-    const u32 offset = VariantOffset(variant);
-    return std::ranges::all_of(PerformanceShaderIds(), [&](u32 id) {
-        const auto hit = resources.find(id + offset);
-        return hit != resources.end() && IsSpirvModule(hit->second);
-    });
-}
-
-[[nodiscard]] std::optional<ShaderVariant> SelectVariant(const ResourceSpans& resources,
-                                                        bool allow_fp16, bool prefer_fp16) {
-    if (prefer_fp16 && HasNativeVariant(resources, ShaderVariant::NativeFp16)) {
-        return ShaderVariant::NativeFp16;
-    }
-    if (HasNativeVariant(resources, ShaderVariant::NativeFp32)) {
-        return ShaderVariant::NativeFp32;
-    }
-    if (allow_fp16 && HasNativeVariant(resources, ShaderVariant::NativeFp16)) {
-        return ShaderVariant::NativeFp16;
-    }
-    return std::nullopt;
-}
-
-[[nodiscard]] LosslessStatus TranslateAll(const ResourceSpans& resources,
-                                          ShaderModules& out_modules,
-                                          ShaderVariant variant) {
-    const u32 offset = VariantOffset(variant);
-    out_modules.clear();
-    for (const u32 id : PerformanceShaderIds()) {
-        const auto hit = resources.find(id + offset);
-        if (hit == resources.end()) {
-            return LosslessStatus::MissingShaders;
-        }
-        std::vector<u32> adopted = AdoptSpirvModule(hit->second);
-        if (adopted.empty()) {
-            return LosslessStatus::TranslationFailed;
-        }
-        out_modules.emplace(id, std::move(adopted));
-    }
-    return LosslessStatus::Ok;
-}
-
-[[nodiscard]] bool WriteShaderCache(const std::filesystem::path& path, const CacheHeader& header,
-                                    const ShaderModules& modules) {
-    Common::FS::IOFile file{path, Common::FS::FileAccessMode::Write,
-                            Common::FS::FileType::BinaryFile};
-    if (!file.IsOpen() || file.Write(header) != 1) {
-        return false;
-    }
-
-    for (const auto& [id, words] : modules) {
-        const u32 word_count = static_cast<u32>(words.size());
-        if (file.Write(id) != 1 || file.Write(word_count) != 1 ||
-            file.Write(words) != words.size()) {
-            return false;
-        }
-    }
-    return file.Flush();
-}
-
-[[nodiscard]] bool ReadShaderCache(const std::filesystem::path& path, u64 source_size,
-                                   u64 source_hash, u32 variant, ShaderModules& out_modules) {
-    if (!Common::FS::Exists(path)) {
-        return false;
-    }
-
-    Common::FS::IOFile file{path, Common::FS::FileAccessMode::Read,
-                            Common::FS::FileType::BinaryFile};
-    CacheHeader header{};
-    if (!file.IsOpen() || file.Read(header) != 1) {
-        return false;
-    }
-    if (header.magic != CACHE_MAGIC || header.version != CACHE_VERSION ||
-        header.source_size != source_size || header.source_hash != source_hash ||
-        header.variant != variant) {
-        return false;
-    }
-
-    out_modules.clear();
-    for (u32 i = 0; i < header.module_count; ++i) {
-        u32 id{};
-        u32 word_count{};
-        if (file.Read(id) != 1 || file.Read(word_count) != 1 || word_count == 0) {
-            return false;
-        }
-
-        std::vector<u32> words(word_count);
-        if (file.Read(words) != words.size()) {
-            return false;
-        }
-        out_modules.emplace(id, std::move(words));
-    }
-
-    return HasPerformanceShaders(out_modules);
-}
-
-[[nodiscard]] LosslessStatus ReadImageFile(const std::filesystem::path& path,
-                                          std::vector<u8>& out_image) {
-    if (!Common::FS::Exists(path)) {
-        return LosslessStatus::NotInstalled;
-    }
-
-    Common::FS::IOFile file{path, Common::FS::FileAccessMode::Read,
-                            Common::FS::FileType::BinaryFile};
-    if (!file.IsOpen()) {
-        return LosslessStatus::UnreadableFile;
-    }
-
-    out_image.resize(static_cast<size_t>(file.GetSize()));
-    if (out_image.empty() || file.Read(out_image) != out_image.size()) {
-        return LosslessStatus::UnreadableFile;
-    }
-    return LosslessStatus::Ok;
-}
-
-[[nodiscard]] LosslessStatus ParseShaderSpans(std::span<const u8> image,
-                                              ResourceSpans& out_resources) {
-    const ImageReader reader{image};
-    const std::optional<size_t> pe_offset = FindPeHeader(reader);
-    if (!pe_offset) {
-        return LosslessStatus::NotPortableExecutable;
-    }
-
-    const std::optional<size_t> data_directory =
-        FindDataDirectory(reader, *pe_offset + 4 + COFF_HEADER_SIZE);
-    if (!data_directory) {
-        return LosslessStatus::NotPortableExecutable;
-    }
-
-    std::vector<Section> sections;
-    if (!ReadSections(reader, *pe_offset, sections)) {
-        return LosslessStatus::NotPortableExecutable;
-    }
-
-    u32 resource_rva{};
-    if (!reader.Read(*data_directory + RESOURCE_DATA_DIRECTORY_INDEX * DATA_DIRECTORY_ENTRY_SIZE,
-                     resource_rva) ||
-        resource_rva == 0) {
-        return LosslessStatus::MissingShaders;
-    }
-
-    const std::optional<size_t> resource_base = RvaToFileOffset(sections, resource_rva);
-    if (!resource_base) {
-        return LosslessStatus::NotPortableExecutable;
-    }
-
-    out_resources.clear();
-    if (!CollectRcData(reader, sections, *resource_base, out_resources)) {
-        return LosslessStatus::MissingShaders;
-    }
-
-    return HasPerformanceShaders(out_resources) ? LosslessStatus::Ok
-                                                : LosslessStatus::MissingShaders;
-}
-
-} // Anonymous namespace
-
-std::filesystem::path GetLosslessDllPath() {
-    return Common::FS::GetEdenPath(Common::FS::EdenPath::LosslessDir) / LOSSLESS_DLL_FILE;
-}
-
-std::filesystem::path GetShaderCachePath() {
-    return Common::FS::GetEdenPath(Common::FS::EdenPath::LosslessDir) / LOSSLESS_CACHE_FILE;
-}
-
-LosslessStatus ReadShaderResources(const std::filesystem::path& path,
-                                   ShaderResources& out_resources) {
-    std::vector<u8> image;
-    const LosslessStatus read_status = ReadImageFile(path, image);
-    if (read_status != LosslessStatus::Ok) {
-        return read_status;
-    }
-
-    ResourceSpans spans;
-    const LosslessStatus parse_status = ParseShaderSpans(image, spans);
-    if (parse_status != LosslessStatus::Ok) {
-        return parse_status;
-    }
-
-    out_resources.clear();
-    for (const auto& [id, data] : spans) {
-        out_resources.emplace(id, std::vector<u8>{data.begin(), data.end()});
-    }
-    return LosslessStatus::Ok;
-}
-
-LosslessStatus ValidateLosslessDll(const std::filesystem::path& path) {
-    std::vector<u8> image;
-    const LosslessStatus read_status = ReadImageFile(path, image);
-    if (read_status != LosslessStatus::Ok) {
-        return read_status;
-    }
-
-    ResourceSpans spans;
-    return ParseShaderSpans(image, spans);
-}
-
-LosslessStatus GetInstalledLosslessStatus() {
-    return ValidateLosslessDll(GetLosslessDllPath());
-}
-
-LosslessStatus LoadShaderModules(ShaderModules& out_modules, bool allow_fp16, bool prefer_fp16) {
-    std::vector<u8> image;
-    const LosslessStatus read_status = ReadImageFile(GetLosslessDllPath(), image);
-    if (read_status != LosslessStatus::Ok) {
-        return read_status;
-    }
-
-    const u64 source_size = image.size();
-    const u64 source_hash =
-        Common::CityHash64(reinterpret_cast<const char*>(image.data()), image.size());
-    const std::filesystem::path cache_path = GetShaderCachePath();
-
-    ResourceSpans spans;
-    const LosslessStatus parse_status = ParseShaderSpans(image, spans);
-    if (parse_status != LosslessStatus::Ok) {
-        return parse_status;
-    }
-
-    const std::optional<ShaderVariant> variant = SelectVariant(spans, allow_fp16, prefer_fp16);
-    if (!variant) {
-        return LosslessStatus::MissingShaders;
-    }
-
-    if (ReadShaderCache(cache_path, source_size, source_hash, static_cast<u32>(*variant),
-                        out_modules)) {
-        return LosslessStatus::Ok;
-    }
-
-    const LosslessStatus translate_status = TranslateAll(spans, out_modules, *variant);
-    if (translate_status != LosslessStatus::Ok) {
-        return translate_status;
-    }
-
-    const CacheHeader header{
-        .magic = CACHE_MAGIC,
-        .version = CACHE_VERSION,
-        .source_size = source_size,
-        .source_hash = source_hash,
-        .module_count = static_cast<u32>(out_modules.size()),
-        .variant = static_cast<u32>(*variant),
-    };
-    if (!WriteShaderCache(cache_path, header, out_modules)) {
-        void(Common::FS::RemoveFile(cache_path));
-        return LosslessStatus::CacheUnusable;
-    }
-
-    return LosslessStatus::Ok;
-}
-
-LosslessStatus BuildShaderCache() {
-    ShaderModules modules;
-    return LoadShaderModules(modules, true);
-}
-
-bool RemoveInstalledLosslessDll() {
-    const std::filesystem::path cache_path = GetShaderCachePath();
-    if (Common::FS::Exists(cache_path)) {
-        void(Common::FS::RemoveFile(cache_path));
-    }
-
-    const std::filesystem::path path = GetLosslessDllPath();
-    if (!Common::FS::Exists(path)) {
-        return true;
-    }
-    return Common::FS::RemoveFile(path);
-}
-
-} // namespace VideoCore::FrameGen

src/video_core/frame_gen/lossless_dll.h

@@ -1,67 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2025 lsfg-vk
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <array>
-#include <filesystem>
-#include <map>
-#include <vector>
-
-#include "common/common_types.h"
-
-namespace VideoCore::FrameGen {
-
-enum class LosslessStatus : u32 {
-    Ok,
-    NotInstalled,
-    UnreadableFile,
-    NotPortableExecutable,
-    MissingShaders,
-    TranslationFailed,
-    CacheUnusable,
-};
-
-using ShaderResources = std::map<u32, std::vector<u8>>;
-using ShaderModules = std::map<u32, std::vector<u32>>;
-
-enum class ShaderVariant : u32 {
-    NativeFp32 = 1,
-    NativeFp16 = 2,
-};
-
-namespace PerformanceShader {
-constexpr u32 MIPMAPS = 255;
-constexpr u32 GENERATE = 256;
-constexpr std::array<u32, 4> ALPHA{290, 291, 292, 293};
-constexpr std::array<u32, 5> BETA{298, 299, 300, 301, 302};
-constexpr std::array<u32, 5> GAMMA{280, 282, 283, 284, 285};
-constexpr std::array<u32, 10> DELTA{280, 286, 287, 288, 289, 281, 294, 295, 296, 297};
-
-constexpr u32 NATIVE_FP16_OFFSET = 49;
-constexpr u32 NATIVE_FP32_OFFSET = 98;
-} // namespace PerformanceShader
-
-[[nodiscard]] std::filesystem::path GetLosslessDllPath();
-
-[[nodiscard]] std::filesystem::path GetShaderCachePath();
-
-[[nodiscard]] LosslessStatus ReadShaderResources(const std::filesystem::path& path,
-                                                 ShaderResources& out_resources);
-
-[[nodiscard]] LosslessStatus ValidateLosslessDll(const std::filesystem::path& path);
-
-[[nodiscard]] LosslessStatus GetInstalledLosslessStatus();
-
-[[nodiscard]] LosslessStatus BuildShaderCache();
-
-[[nodiscard]] LosslessStatus LoadShaderModules(ShaderModules& out_modules,
-                                              bool allow_fp16 = false,
-                                              bool prefer_fp16 = false);
-
-bool RemoveInstalledLosslessDll();
-
-} // namespace VideoCore::FrameGen

src/video_core/frame_gen/lsfg_translate.cpp

@@ -1,93 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <algorithm>
-#include <cstring>
-#include <map>
-#include <tuple>
-
-#include "video_core/frame_gen/lsfg_translate.h"
-
-namespace VideoCore::FrameGen {
-
-namespace {
-
-constexpr u32 SPIRV_MAGIC = 0x07230203;
-constexpr u32 SPIRV_WORD_COUNT_SHIFT = 16;
-constexpr u32 SPIRV_OPCODE_MASK = 0xffff;
-constexpr u32 SPIRV_OP_FUNCTION = 54;
-constexpr u32 SPIRV_OP_DECORATE = 71;
-constexpr u32 SPIRV_DECORATION_BINDING = 33;
-constexpr u32 SPIRV_DECORATION_DESCRIPTOR_SET = 34;
-
-constexpr u32 DECORATION_LITERAL_WORD = 3;
-constexpr size_t SPIRV_HEADER_WORDS = 5;
-
-void RenumberBindingsInOrder(std::vector<u32>& words) {
-    struct Slot {
-        u32 set;
-        u32 binding;
-        size_t literal_offset;
-    };
-
-    std::map<u32, u32> sets;
-    std::vector<Slot> slots;
-
-    size_t offset = SPIRV_HEADER_WORDS;
-    while (offset + 1 <= words.size()) {
-        const u32 length = words[offset] >> SPIRV_WORD_COUNT_SHIFT;
-        const u32 opcode = words[offset] & SPIRV_OPCODE_MASK;
-        if (length == 0 || offset + length > words.size()) {
-            return;
-        }
-        if (opcode == SPIRV_OP_FUNCTION) {
-            break;
-        }
-        if (opcode == SPIRV_OP_DECORATE && length >= 4) {
-            if (words[offset + 2] == SPIRV_DECORATION_DESCRIPTOR_SET) {
-                sets[words[offset + 1]] = words[offset + 3];
-            } else if (words[offset + 2] == SPIRV_DECORATION_BINDING) {
-                slots.push_back(Slot{0, words[offset + 3], offset + DECORATION_LITERAL_WORD});
-            }
-        }
-        offset += length;
-    }
-
-    for (Slot& slot : slots) {
-        const auto hit = sets.find(words[slot.literal_offset - 2]);
-        slot.set = hit == sets.end() ? 0 : hit->second;
-    }
-
-    std::ranges::stable_sort(slots, [](const Slot& lhs, const Slot& rhs) {
-        return std::tie(lhs.set, lhs.binding) < std::tie(rhs.set, rhs.binding);
-    });
-
-    for (size_t i = 0; i < slots.size(); ++i) {
-        words[slots[i].literal_offset] = static_cast<u32>(i);
-    }
-}
-
-} // Anonymous namespace
-
-bool IsSpirvModule(std::span<const u8> blob) {
-    if (blob.size() < SPIRV_HEADER_WORDS * sizeof(u32) || blob.size() % sizeof(u32) != 0) {
-        return false;
-    }
-    u32 magic{};
-    std::memcpy(&magic, blob.data(), sizeof(magic));
-    return magic == SPIRV_MAGIC;
-}
-
-std::vector<u32> AdoptSpirvModule(std::span<const u8> blob) {
-    if (!IsSpirvModule(blob)) {
-        return {};
-    }
-
-    std::vector<u32> words(blob.size() / sizeof(u32));
-    std::memcpy(words.data(), blob.data(), blob.size());
-
-    RenumberBindingsInOrder(words);
-    return words;
-}
-
-} // namespace VideoCore::FrameGen

src/video_core/frame_gen/lsfg_translate.h

@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <span>
-#include <vector>
-
-#include "common/common_types.h"
-
-namespace VideoCore::FrameGen {
-
-[[nodiscard]] bool IsSpirvModule(std::span<const u8> blob);
-
-[[nodiscard]] std::vector<u32> AdoptSpirvModule(std::span<const u8> blob);
-
-} // namespace VideoCore::FrameGen

src/video_core/host_shaders/CMakeLists.txt

@@ -17,14 +17,11 @@ set(SHADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/astc_decoder.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/blit_color_float.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_2d.comp
-    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_2d_buffer.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/blit_color_msaa.frag
-    ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth_msaa.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth_stencil_msaa.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_3d.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_3d_bcn.comp
-    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_3d_buffer.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_abgr8_to_d24s8.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_abgr8_to_d32f.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_d32f_to_abgr8.frag
@@ -33,12 +30,8 @@ set(SHADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_float_to_depth.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa.frag
-    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa_depth.frag
-    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa_depth_stencil.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa.comp
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa.frag
-    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa_depth.frag
-    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa_depth_stencil.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/convert_s8d24_to_abgr8.frag
     ${CMAKE_CURRENT_SOURCE_DIR}/full_screen_triangle.vert
     ${CMAKE_CURRENT_SOURCE_DIR}/fxaa.frag
@@ -170,44 +163,6 @@ foreach(SOURCE_FILE IN ITEMS ${SHADER_FILES})
     endif()
 endforeach()
 
-# Integer variants of the MSAA conversion shaders. They only differ from the float
-# source in the sampler and output types, so they are generated from it via defines.
-set(SHADER_TYPE_VARIANTS
-    "convert_msaa_to_non_msaa.frag|sint|isampler2DMS|ivec4"
-    "convert_msaa_to_non_msaa.frag|uint|usampler2DMS|uvec4"
-    "convert_non_msaa_to_msaa.frag|sint|isampler2D|ivec4"
-    "convert_non_msaa_to_msaa.frag|uint|usampler2D|uvec4"
-)
-
-foreach(VARIANT IN ITEMS ${SHADER_TYPE_VARIANTS})
-    string(REPLACE "|" ";" VARIANT_PARTS ${VARIANT})
-    list(GET VARIANT_PARTS 0 VARIANT_FILENAME)
-    list(GET VARIANT_PARTS 1 VARIANT_SUFFIX)
-    list(GET VARIANT_PARTS 2 VARIANT_SAMPLER)
-    list(GET VARIANT_PARTS 3 VARIANT_TEXEL)
-
-    set(VARIANT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${VARIANT_FILENAME})
-    get_filename_component(VARIANT_STEM ${VARIANT_FILENAME} NAME_WE)
-    get_filename_component(VARIANT_EXT ${VARIANT_FILENAME} EXT)
-    string(REPLACE "." "" VARIANT_EXT ${VARIANT_EXT})
-    set(VARIANT_NAME ${VARIANT_STEM}_${VARIANT_SUFFIX}_${VARIANT_EXT})
-
-    string(TOUPPER ${VARIANT_NAME}_SPV VARIANT_VARIABLE_NAME)
-    set(VARIANT_HEADER_FILE ${SHADER_DIR}/${VARIANT_NAME}_spv.h)
-    add_custom_command(
-        OUTPUT
-            ${VARIANT_HEADER_FILE}
-        COMMAND
-            ${GLSLANGVALIDATOR} -V ${QUIET_FLAG} -I"${FIDELITYFX_INCLUDE_DIR}" ${GLSL_FLAGS}
-            -DSAMPLER_TYPE=${VARIANT_SAMPLER} -DTEXEL_TYPE=${VARIANT_TEXEL}
-            --variable-name ${VARIANT_VARIABLE_NAME} -o ${VARIANT_HEADER_FILE} ${VARIANT_SOURCE}
-            --target-env ${SPIR_V_VERSION}
-        MAIN_DEPENDENCY
-            ${VARIANT_SOURCE}
-    )
-    set(SHADER_HEADERS ${SHADER_HEADERS} ${VARIANT_HEADER_FILE})
-endforeach()
-
 foreach(FILEPATH IN ITEMS ${FIDELITYFX_FILES})
     get_filename_component(FILENAME ${FILEPATH} NAME)
     string(REPLACE "." "_" HEADER_NAME ${FILENAME})

src/video_core/host_shaders/blit_depth.frag

@@ -1,12 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 450 core
-
-layout(binding = 0) uniform sampler2D depth_tex;
-
-layout(location = 0) in vec2 texcoord;
-
-void main() {
-    gl_FragDepth = textureLod(depth_tex, texcoord, 0).r;
-}

src/video_core/host_shaders/blit_depth_msaa.frag

@@ -8,5 +8,5 @@ layout(binding = 0) uniform sampler2DMS depth_tex;
 layout(location = 0) in vec2 texcoord;
 
 void main() {
-    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), gl_SampleID).r;
+    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), 0).r;
 }

src/video_core/host_shaders/blit_depth_stencil_msaa.frag

@@ -10,6 +10,6 @@ layout(binding = 1) uniform usampler2DMS stencil_tex;
 layout(location = 0) in vec2 texcoord;
 
 void main() {
-    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), gl_SampleID).r;
-    gl_FragStencilRefARB = int(texelFetch(stencil_tex, ivec2(texcoord), gl_SampleID).r);
+    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), 0).r;
+    gl_FragStencilRefARB = int(texelFetch(stencil_tex, ivec2(texcoord), 0).r);
 }

src/video_core/host_shaders/block_linear_unswizzle_2d_buffer.comp

@@ -1,104 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 430
-
-#extension GL_EXT_shader_16bit_storage : require
-#extension GL_EXT_shader_8bit_storage : require
-
-#define BINDING_INPUT_BUFFER 0
-#define BINDING_OUTPUT_BUFFER 1
-
-layout(push_constant) uniform PushConstants {
-    uvec3 dim;
-    uint bytes_per_block_log2;
-
-    uvec3 origin;
-    uint layer_stride;
-
-    uint block_size;
-    uint x_shift;
-    uint block_height;
-    uint block_height_mask;
-} pc;
-
-layout(binding = BINDING_INPUT_BUFFER, std430) buffer InputBufferU32 { uint u32data[]; };
-layout(binding = BINDING_INPUT_BUFFER, std430) buffer InputBufferU64 { uvec2 u64data[]; };
-layout(binding = BINDING_INPUT_BUFFER, std430) buffer InputBufferU128 { uvec4 u128data[]; };
-
-layout(binding = BINDING_OUTPUT_BUFFER, std430) writeonly buffer OutputBuffer {
-    uint out_u32[];
-};
-
-layout(local_size_x = 16, local_size_y = 8, local_size_z = 1) in;
-
-const uint GOB_SIZE_X = 64;
-const uint GOB_SIZE_Y = 8;
-
-const uint GOB_SIZE_X_SHIFT = 6;
-const uint GOB_SIZE_Y_SHIFT = 3;
-const uint GOB_SIZE_SHIFT = GOB_SIZE_X_SHIFT + GOB_SIZE_Y_SHIFT;
-
-const uvec2 SWIZZLE_MASK = uvec2(GOB_SIZE_X - 1u, GOB_SIZE_Y - 1u);
-
-uint SwizzleTable(uint pos) {
-    const uint t[8] = uint[](
-        0x12100200, 0x13110301, 0x16140604, 0x17150705,
-        0x1a180a08, 0x1b190b09, 0x1e1c0e0c, 0x1f1d0f0d
-    );
-    const uint i = pos >> 4;
-    const uint h = (t[i / 4] >> ((i % 4) * 8)) & 0xff;
-    return (h << 4) | (pos & 0xf);
-}
-
-uint SwizzleOffset(uvec2 pos) {
-    pos = pos & SWIZZLE_MASK;
-    return SwizzleTable(pos.y * 64u + pos.x);
-}
-
-uvec4 ReadTexel(uint offset) {
-    switch (pc.bytes_per_block_log2) {
-    case 2u:
-        return uvec4(u32data[offset / 4u], 0u, 0u, 0u);
-    case 3u:
-        return uvec4(u64data[offset / 8u], 0u, 0u);
-    case 4u:
-        return u128data[offset / 16u];
-    }
-    return uvec4(0u);
-}
-
-void main() {
-    uvec3 coord = gl_GlobalInvocationID;
-    if (coord.x >= pc.dim.x || coord.y >= pc.dim.y || coord.z >= pc.dim.z) {
-        return;
-    }
-
-    uvec3 pos = coord + pc.origin;
-    pos.x <<= pc.bytes_per_block_log2;
-
-    uint swizzle = SwizzleOffset(pos.xy);
-    uint block_y = pos.y >> GOB_SIZE_Y_SHIFT;
-
-    uint offset = 0u;
-    offset += pos.z * pc.layer_stride;
-    offset += (block_y >> pc.block_height) * pc.block_size;
-    offset += (block_y & pc.block_height_mask) << GOB_SIZE_SHIFT;
-    offset += (pos.x >> GOB_SIZE_X_SHIFT) << pc.x_shift;
-    offset += swizzle;
-
-    uvec4 texel = ReadTexel(offset);
-
-    uint words = 1u << (pc.bytes_per_block_log2 - 2u);
-    uint linear_index = coord.x + coord.y * pc.dim.x + coord.z * pc.dim.x * pc.dim.y;
-    uint out_idx = linear_index * words;
-
-    out_u32[out_idx] = texel.x;
-    if (words > 1u) {
-        out_u32[out_idx + 1u] = texel.y;
-    }
-    if (words > 2u) {
-        out_u32[out_idx + 2u] = texel.z;
-        out_u32[out_idx + 3u] = texel.w;
-    }
-}

src/video_core/host_shaders/block_linear_unswizzle_3d_buffer.comp

@@ -1,105 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 430
-
-#define BINDING_INPUT_BUFFER 0
-#define BINDING_OUTPUT_BUFFER 1
-
-layout(push_constant) uniform PushConstants {
-    uvec3 dim;
-    uint bytes_per_block_log2;
-
-    uvec3 origin;
-    uint slice_size;
-
-    uint block_size;
-    uint x_shift;
-    uint block_height;
-    uint block_height_mask;
-
-    uint block_depth;
-    uint block_depth_mask;
-} pc;
-
-layout(binding = BINDING_INPUT_BUFFER, std430) buffer InputBufferU32 { uint u32data[]; };
-layout(binding = BINDING_INPUT_BUFFER, std430) buffer InputBufferU64 { uvec2 u64data[]; };
-layout(binding = BINDING_INPUT_BUFFER, std430) buffer InputBufferU128 { uvec4 u128data[]; };
-
-layout(binding = BINDING_OUTPUT_BUFFER, std430) writeonly buffer OutputBuffer {
-    uint out_u32[];
-};
-
-layout(local_size_x = 8, local_size_y = 8, local_size_z = 4) in;
-
-const uint GOB_SIZE_X = 64;
-const uint GOB_SIZE_Y = 8;
-
-const uint GOB_SIZE_X_SHIFT = 6;
-const uint GOB_SIZE_Y_SHIFT = 3;
-const uint GOB_SIZE_SHIFT = GOB_SIZE_X_SHIFT + GOB_SIZE_Y_SHIFT;
-
-const uvec2 SWIZZLE_MASK = uvec2(GOB_SIZE_X - 1u, GOB_SIZE_Y - 1u);
-
-uint SwizzleTable(uint pos) {
-    const uint t[8] = uint[](
-        0x12100200, 0x13110301, 0x16140604, 0x17150705,
-        0x1a180a08, 0x1b190b09, 0x1e1c0e0c, 0x1f1d0f0d
-    );
-    const uint i = pos >> 4;
-    const uint h = (t[i / 4] >> ((i % 4) * 8)) & 0xff;
-    return (h << 4) | (pos & 0xf);
-}
-
-uint SwizzleOffset(uvec2 pos) {
-    pos = pos & SWIZZLE_MASK;
-    return SwizzleTable(pos.y * 64u + pos.x);
-}
-
-uvec4 ReadTexel(uint offset) {
-    switch (pc.bytes_per_block_log2) {
-    case 2u:
-        return uvec4(u32data[offset / 4u], 0u, 0u, 0u);
-    case 3u:
-        return uvec4(u64data[offset / 8u], 0u, 0u);
-    case 4u:
-        return u128data[offset / 16u];
-    }
-    return uvec4(0u);
-}
-
-void main() {
-    uvec3 coord = gl_GlobalInvocationID;
-    if (coord.x >= pc.dim.x || coord.y >= pc.dim.y || coord.z >= pc.dim.z) {
-        return;
-    }
-
-    uvec3 pos = coord + pc.origin;
-    pos.x <<= pc.bytes_per_block_log2;
-
-    uint swizzle = SwizzleOffset(pos.xy);
-    uint block_y = pos.y >> GOB_SIZE_Y_SHIFT;
-
-    uint offset = 0u;
-    offset += (pos.z >> pc.block_depth) * pc.slice_size;
-    offset += (pos.z & pc.block_depth_mask) << (GOB_SIZE_SHIFT + pc.block_height);
-    offset += (block_y >> pc.block_height) * pc.block_size;
-    offset += (block_y & pc.block_height_mask) << GOB_SIZE_SHIFT;
-    offset += (pos.x >> GOB_SIZE_X_SHIFT) << pc.x_shift;
-    offset += swizzle;
-
-    uvec4 texel = ReadTexel(offset);
-
-    uint words = 1u << (pc.bytes_per_block_log2 - 2u);
-    uint linear_index = coord.x + coord.y * pc.dim.x + coord.z * pc.dim.x * pc.dim.y;
-    uint out_idx = linear_index * words;
-
-    out_u32[out_idx] = texel.x;
-    if (words > 1u) {
-        out_u32[out_idx + 1u] = texel.y;
-    }
-    if (words > 2u) {
-        out_u32[out_idx + 2u] = texel.z;
-        out_u32[out_idx + 3u] = texel.w;
-    }
-}

src/video_core/host_shaders/convert_msaa_to_non_msaa.frag

@@ -3,14 +3,7 @@
 
 #version 450 core
 
-#ifndef SAMPLER_TYPE
-#define SAMPLER_TYPE sampler2DMS
-#endif
-#ifndef TEXEL_TYPE
-#define TEXEL_TYPE vec4
-#endif
-
-layout(binding = 0) uniform SAMPLER_TYPE msaa_in;
+layout(binding = 0) uniform sampler2DMS msaa_in;
 
 layout(push_constant) uniform PushConstants {
     ivec2 dst_offset;
@@ -18,7 +11,7 @@ layout(push_constant) uniform PushConstants {
     ivec2 scale;
 };
 
-layout(location = 0) out TEXEL_TYPE frag_color;
+layout(location = 0) out vec4 frag_color;
 
 void main() {
     const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;

src/video_core/host_shaders/convert_msaa_to_non_msaa_depth.frag

@@ -1,20 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 450 core
-
-layout(binding = 0) uniform sampler2DMS msaa_in;
-
-layout(push_constant) uniform PushConstants {
-    ivec2 dst_offset;
-    ivec2 src_offset;
-    ivec2 scale;
-};
-
-void main() {
-    const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;
-    const ivec2 msaa_coord = coord / scale;
-    const ivec2 sample_offset = coord % scale;
-    const int sample_id = sample_offset.x + scale.x * sample_offset.y;
-    gl_FragDepth = texelFetch(msaa_in, msaa_coord, sample_id).r;
-}

src/video_core/host_shaders/convert_msaa_to_non_msaa_depth_stencil.frag

@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 450 core
-#extension GL_ARB_shader_stencil_export : require
-
-layout(binding = 0) uniform sampler2DMS depth_tex;
-layout(binding = 1) uniform usampler2DMS stencil_tex;
-
-layout(push_constant) uniform PushConstants {
-    ivec2 dst_offset;
-    ivec2 src_offset;
-    ivec2 scale;
-};
-
-void main() {
-    const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;
-    const ivec2 msaa_coord = coord / scale;
-    const ivec2 sample_offset = coord % scale;
-    const int sample_id = sample_offset.x + scale.x * sample_offset.y;
-    gl_FragDepth = texelFetch(depth_tex, msaa_coord, sample_id).r;
-    gl_FragStencilRefARB = int(texelFetch(stencil_tex, msaa_coord, sample_id).r);
-}

src/video_core/host_shaders/convert_non_msaa_to_msaa.frag

@@ -3,14 +3,7 @@
 
 #version 450 core
 
-#ifndef SAMPLER_TYPE
-#define SAMPLER_TYPE sampler2D
-#endif
-#ifndef TEXEL_TYPE
-#define TEXEL_TYPE vec4
-#endif
-
-layout(binding = 0) uniform SAMPLER_TYPE img_in;
+layout(binding = 0) uniform sampler2D img_in;
 
 layout(push_constant) uniform PushConstants {
     ivec2 dst_offset;
@@ -18,7 +11,7 @@ layout(push_constant) uniform PushConstants {
     ivec2 scale;
 };
 
-layout(location = 0) out TEXEL_TYPE frag_color;
+layout(location = 0) out vec4 frag_color;
 
 void main() {
     const ivec2 msaa_coord = ivec2(gl_FragCoord.xy) - dst_offset;

src/video_core/host_shaders/convert_non_msaa_to_msaa_depth.frag

@@ -1,19 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 450 core
-
-layout(binding = 0) uniform sampler2D img_in;
-
-layout(push_constant) uniform PushConstants {
-    ivec2 dst_offset;
-    ivec2 src_offset;
-    ivec2 scale;
-};
-
-void main() {
-    const ivec2 msaa_coord = ivec2(gl_FragCoord.xy) - dst_offset;
-    const ivec2 sample_offset = ivec2(gl_SampleID % scale.x, gl_SampleID / scale.x);
-    const ivec2 coord = msaa_coord * scale + sample_offset + src_offset;
-    gl_FragDepth = texelFetch(img_in, coord, 0).r;
-}

src/video_core/host_shaders/convert_non_msaa_to_msaa_depth_stencil.frag

@@ -1,22 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#version 450 core
-#extension GL_ARB_shader_stencil_export : require
-
-layout(binding = 0) uniform sampler2D depth_tex;
-layout(binding = 1) uniform usampler2D stencil_tex;
-
-layout(push_constant) uniform PushConstants {
-    ivec2 dst_offset;
-    ivec2 src_offset;
-    ivec2 scale;
-};
-
-void main() {
-    const ivec2 msaa_coord = ivec2(gl_FragCoord.xy) - dst_offset;
-    const ivec2 sample_offset = ivec2(gl_SampleID % scale.x, gl_SampleID / scale.x);
-    const ivec2 coord = msaa_coord * scale + sample_offset + src_offset;
-    gl_FragDepth = texelFetch(depth_tex, coord, 0).r;
-    gl_FragStencilRefARB = int(texelFetch(stencil_tex, coord, 0).r);
-}

src/video_core/host_shaders/sgsr1_shader.vert

@@ -7,7 +7,6 @@ layout(push_constant) uniform constants {
     vec2 scale;
     vec2 size;
     vec2 resize_factor;
-    vec2 crop_offset;
     float edge_sharpness;
 };
 layout(location = 0) out highp vec2 texcoord;
@@ -16,5 +15,5 @@ void main() {
     float x = float((gl_VertexIndex & 1) << 2);
     float y = float((gl_VertexIndex & 2) << 1);
     gl_Position = vec4(x - 1.0f, y - 1.0f, 0.0, 1.0f) * vec4(sign(resize_factor), 1.f, 1.f);
-    texcoord = crop_offset + vec2(x, y) * abs(resize_factor) * 0.5;
+    texcoord = vec2(x, y) * abs(resize_factor) * 0.5;
 }

src/video_core/host_shaders/sgsr1_shader_mobile.frag

@@ -14,7 +14,6 @@ layout(push_constant) uniform constants {
     vec2 scale;
     vec2 size;
     vec2 resize_factor;
-    vec2 crop_offset;
     float edge_sharpness;
 };
 layout(set = 0, binding = 0) uniform sampler2D sampler0;

src/video_core/host_shaders/sgsr1_shader_mobile_edge_direction.frag

@@ -13,7 +13,6 @@
 layout( push_constant ) uniform constants {
     vec4 ViewportInfo[1];
     vec2 ResizeFactor;
-    vec2 CropOffset;
     float EdgeSharpness;
 };
 layout(set = 0, binding = 0) uniform sampler2D ps0;

src/video_core/renderer_opengl/gl_graphics_pipeline.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
@@ -44,7 +44,6 @@ struct GraphicsPipelineKey {
         BitField<8, 2, Maxwell::Tessellation::Spacing> tessellation_spacing;
         BitField<10, 1, u32> tessellation_clockwise;
         BitField<11, 3, Tegra::Engines::Maxwell3D::EngineHint> app_stage;
-        BitField<14, 1, u32> viewport_scale_offset_enabled;
     };
     std::array<u32, 3> padding;
     VideoCommon::TransformFeedbackState xfb_state;

src/video_core/renderer_opengl/gl_shader_cache.cpp

@@ -45,7 +45,6 @@ using Shader::Backend::SPIRV::EmitSPIRV;
 using Shader::Maxwell::ConvertLegacyToGeneric;
 using Shader::Maxwell::GenerateGeometryPassthrough;
 using Shader::Maxwell::MergeDualVertexPrograms;
-using Shader::Maxwell::PrunePassthroughStores;
 using Shader::Maxwell::TranslateProgram;
 using VideoCommon::ComputeEnvironment;
 using VideoCommon::FileEnvironment;
@@ -55,56 +54,24 @@ using VideoCommon::LoadPipelines;
 using VideoCommon::SerializePipeline;
 using Context = ShaderContext::Context;
 
-constexpr u32 CACHE_VERSION = 21;
+constexpr u32 CACHE_VERSION = 15;
 
 template <typename Container>
 auto MakeSpan(Container& container) {
     return std::span(container.data(), container.size());
 }
 
-Shader::OutputTopology InputToOutputTopology(Shader::InputTopology topology) {
-    switch (topology) {
-    case Shader::InputTopology::Points:
-        return Shader::OutputTopology::PointList;
-    case Shader::InputTopology::Lines:
-    case Shader::InputTopology::LinesAdjacency:
-        return Shader::OutputTopology::LineStrip;
-    case Shader::InputTopology::Triangles:
-    case Shader::InputTopology::TrianglesAdjacency:
-        return Shader::OutputTopology::TriangleStrip;
-    }
-    return Shader::OutputTopology::TriangleStrip;
-}
-
-Shader::InputTopology MaxwellToInputTopology(Maxwell::PrimitiveTopology topology) {
+Shader::OutputTopology MaxwellToOutputTopology(Maxwell::PrimitiveTopology topology) {
     switch (topology) {
     case Maxwell::PrimitiveTopology::Points:
-        return Shader::InputTopology::Points;
-    case Maxwell::PrimitiveTopology::Lines:
-    case Maxwell::PrimitiveTopology::LineLoop:
+        return Shader::OutputTopology::PointList;
     case Maxwell::PrimitiveTopology::LineStrip:
-        return Shader::InputTopology::Lines;
-    case Maxwell::PrimitiveTopology::LinesAdjacency:
-    case Maxwell::PrimitiveTopology::LineStripAdjacency:
-        return Shader::InputTopology::LinesAdjacency;
-    case Maxwell::PrimitiveTopology::TrianglesAdjacency:
-    case Maxwell::PrimitiveTopology::TriangleStripAdjacency:
-        return Shader::InputTopology::TrianglesAdjacency;
+        return Shader::OutputTopology::LineStrip;
     default:
-        return Shader::InputTopology::Triangles;
+        return Shader::OutputTopology::TriangleStrip;
     }
 }
 
-Shader::InputTopology GeometryInputTopology(const GraphicsPipelineKey& key) {
-    if (key.unique_hashes[static_cast<size_t>(Maxwell::ShaderType::Tessellation)] == 0) {
-        return MaxwellToInputTopology(key.gs_input_topology);
-    }
-    if (key.tessellation_primitive == Maxwell::Tessellation::DomainType::Isolines) {
-        return Shader::InputTopology::Lines;
-    }
-    return Shader::InputTopology::Triangles;
-}
-
 Shader::RuntimeInfo MakeRuntimeInfo(const GraphicsPipelineKey& key,
                                     const Shader::IR::Program& program,
                                     const Shader::IR::Program* previous_program,
@@ -160,7 +127,33 @@ Shader::RuntimeInfo MakeRuntimeInfo(const GraphicsPipelineKey& key,
     default:
         break;
     }
-    info.input_topology = GeometryInputTopology(key);
+    switch (key.gs_input_topology) {
+    case Maxwell::PrimitiveTopology::Points:
+        info.input_topology = Shader::InputTopology::Points;
+        break;
+    case Maxwell::PrimitiveTopology::Lines:
+    case Maxwell::PrimitiveTopology::LineLoop:
+    case Maxwell::PrimitiveTopology::LineStrip:
+        info.input_topology = Shader::InputTopology::Lines;
+        break;
+    case Maxwell::PrimitiveTopology::Triangles:
+    case Maxwell::PrimitiveTopology::TriangleStrip:
+    case Maxwell::PrimitiveTopology::TriangleFan:
+    case Maxwell::PrimitiveTopology::Quads:
+    case Maxwell::PrimitiveTopology::QuadStrip:
+    case Maxwell::PrimitiveTopology::Polygon:
+    case Maxwell::PrimitiveTopology::Patches:
+        info.input_topology = Shader::InputTopology::Triangles;
+        break;
+    case Maxwell::PrimitiveTopology::LinesAdjacency:
+    case Maxwell::PrimitiveTopology::LineStripAdjacency:
+        info.input_topology = Shader::InputTopology::LinesAdjacency;
+        break;
+    case Maxwell::PrimitiveTopology::TrianglesAdjacency:
+    case Maxwell::PrimitiveTopology::TriangleStripAdjacency:
+        info.input_topology = Shader::InputTopology::TrianglesAdjacency;
+        break;
+    }
     info.glasm_use_storage_buffers = glasm_use_storage_buffers;
     return info;
 }
@@ -238,8 +231,6 @@ ShaderCache::ShaderCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
           .has_broken_unsigned_image_offsets = true,
           .has_broken_signed_operations = true,
           .has_broken_fp16_float_controls = false,
-          .has_broken_fp32_signed_zero_nan_preserve = false,
-          .has_broken_fp32_denorm_flush = false,
           .has_gl_component_indexing_bug = device.HasComponentIndexingBug(),
           .has_gl_precise_bug = device.HasPreciseBug(),
           .has_gl_cbuf_ftou_bug = device.HasCbufFtouBug(),
@@ -392,7 +383,6 @@ GraphicsPipeline* ShaderCache::CurrentGraphicsPipeline() {
         regs.tessellation.params.output_primitives.Value() ==
         Maxwell::Tessellation::OutputPrimitives::Triangles_CW);
     graphics_key.xfb_enabled.Assign(regs.transform_feedback_enabled != 0 ? 1 : 0);
-    graphics_key.viewport_scale_offset_enabled.Assign(regs.viewport_scale_offset_enabled != 0);
     graphics_key.app_stage.Assign(maxwell3d->engine_state);
     if (graphics_key.xfb_enabled) {
         SetXfbState(graphics_key.xfb_state, regs);
@@ -492,10 +482,9 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
         const bool is_emulated_stage = layer_source_program != nullptr
             && index == u32(Maxwell::ShaderType::Geometry);
         if (key.unique_hashes[index] == 0 && is_emulated_stage) {
-            const auto input_topology = GeometryInputTopology(key);
-            programs[index] = GenerateGeometryPassthrough(
-                pools.inst, pools.block, host_info, *layer_source_program,
-                InputToOutputTopology(input_topology), input_topology);
+            auto topology = MaxwellToOutputTopology(key.gs_input_topology);
+            programs[index] = GenerateGeometryPassthrough(pools.inst, pools.block, host_info,
+                                                          *layer_source_program, topology);
             continue;
         }
         if (key.unique_hashes[index] == 0) {
@@ -513,15 +502,13 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
 
         if (!uses_vertex_a || index != 1) {
             // Normal path
-            programs[index] = TranslateProgram(pools.inst, pools.block, env, cfg, host_info,
-                                              GeometryInputTopology(key));
+            programs[index] = TranslateProgram(pools.inst, pools.block, env, cfg, host_info);
 
             total_storage_buffers += Shader::NumDescriptors(programs[index].info.storage_buffers_descriptors);
         } else {
             // VertexB path when VertexA is present.
             auto& program_va{programs[0]};
-            auto program_vb{TranslateProgram(pools.inst, pools.block, env, cfg, host_info,
-                                             GeometryInputTopology(key))};
+            auto program_vb{TranslateProgram(pools.inst, pools.block, env, cfg, host_info)};
             total_storage_buffers += Shader::NumDescriptors(program_vb.info.storage_buffers_descriptors);
             programs[index] = MergeDualVertexPrograms(program_va, program_vb, env);
         }
@@ -553,9 +540,6 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
         const size_t stage_index{index - 1};
         infos[stage_index] = &program.info;
 
-        if (previous_program) {
-            PrunePassthroughStores(program, previous_program->info.stores);
-        }
         const auto runtime_info = MakeRuntimeInfo(key, program, previous_program, glasm_use_storage_buffers, use_glasm);
         switch (::Settings::values.renderer_backend.GetValue()) {
         case Settings::RendererBackend::OpenGL_GLSL:
@@ -613,8 +597,7 @@ std::unique_ptr<ComputePipeline> ShaderCache::CreateComputePipeline(
         env.Dump(hash, key.unique_hash);
     }
 
-    auto program{TranslateProgram(pools.inst, pools.block, env, cfg, host_info,
-                                  Shader::InputTopology::Points)};
+    auto program{TranslateProgram(pools.inst, pools.block, env, cfg, host_info)};
     const u32 num_storage_buffers{Shader::NumDescriptors(program.info.storage_buffers_descriptors)};
     Shader::RuntimeInfo info;
     info.glasm_use_storage_buffers = num_storage_buffers <= device.GetMaxGLASMStorageBufferBlocks();

src/video_core/renderer_opengl/gl_texture_cache.h

@@ -75,8 +75,6 @@ public:
 
     void Finish();
 
-    void FlushDeferredClear() {}
-
     StagingBufferMap UploadStagingBuffer(size_t size, bool deferred = false);
 
     StagingBufferMap DownloadStagingBuffer(size_t size, bool deferred = false);
@@ -372,7 +370,6 @@ struct TextureCacheParams {
     static constexpr bool HAS_EMULATED_COPIES = true;
     static constexpr bool HAS_DEVICE_MEMORY_INFO = true;
     static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = true;
-    static constexpr bool HAS_MSAA_DOWNLOADS = false;
 
     using Runtime = OpenGL::TextureCacheRuntime;
     using Image = OpenGL::Image;

src/video_core/renderer_vulkan/blit_image.cpp

@@ -12,7 +12,6 @@
 #include "common/settings.h"
 #include "video_core/host_shaders/blit_color_float_frag_spv.h"
 #include "video_core/host_shaders/blit_color_msaa_frag_spv.h"
-#include "video_core/host_shaders/blit_depth_frag_spv.h"
 #include "video_core/host_shaders/blit_depth_msaa_frag_spv.h"
 #include "video_core/host_shaders/blit_depth_stencil_msaa_frag_spv.h"
 #include "video_core/host_shaders/convert_abgr8_to_d24s8_frag_spv.h"
@@ -22,15 +21,7 @@
 #include "video_core/host_shaders/convert_depth_to_float_frag_spv.h"
 #include "video_core/host_shaders/convert_float_to_depth_frag_spv.h"
 #include "video_core/host_shaders/convert_msaa_to_non_msaa_frag_spv.h"
-#include "video_core/host_shaders/convert_msaa_to_non_msaa_depth_frag_spv.h"
-#include "video_core/host_shaders/convert_msaa_to_non_msaa_depth_stencil_frag_spv.h"
-#include "video_core/host_shaders/convert_msaa_to_non_msaa_sint_frag_spv.h"
-#include "video_core/host_shaders/convert_msaa_to_non_msaa_uint_frag_spv.h"
 #include "video_core/host_shaders/convert_non_msaa_to_msaa_frag_spv.h"
-#include "video_core/host_shaders/convert_non_msaa_to_msaa_sint_frag_spv.h"
-#include "video_core/host_shaders/convert_non_msaa_to_msaa_uint_frag_spv.h"
-#include "video_core/host_shaders/convert_non_msaa_to_msaa_depth_frag_spv.h"
-#include "video_core/host_shaders/convert_non_msaa_to_msaa_depth_stencil_frag_spv.h"
 #include "video_core/host_shaders/convert_s8d24_to_abgr8_frag_spv.h"
 #include "video_core/host_shaders/full_screen_triangle_vert_spv.h"
 #include "video_core/host_shaders/vulkan_blit_depth_stencil_frag_spv.h"
@@ -527,19 +518,8 @@ void RecordShaderReadBarrier(Scheduler& scheduler, const ImageView& image_view)
     }
 }
 
-[[nodiscard]] MSAACopyFormatClass FormatClass(VideoCore::Surface::PixelFormat format) {
-    if (!VideoCore::Surface::IsPixelFormatInteger(format)) {
-        return MSAACopyFormatClass::Float;
-    }
-    if (VideoCore::Surface::IsPixelFormatSignedInteger(format)) {
-        return MSAACopyFormatClass::SignedInteger;
-    }
-    return MSAACopyFormatClass::UnsignedInteger;
-}
-
 [[nodiscard]] vk::ImageView MakeMSAACopyView(const vk::Device& device, VkImage image,
-                                             VkFormat format, u32 base_level, u32 base_layer,
-                                             VkImageAspectFlags aspect_mask) {
+                                             VkFormat format, u32 base_level) {
     return device.CreateImageView(VkImageViewCreateInfo{
         .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
         .pNext = nullptr,
@@ -554,10 +534,10 @@ void RecordShaderReadBarrier(Scheduler& scheduler, const ImageView& image_view)
             .a = VK_COMPONENT_SWIZZLE_IDENTITY,
         },
         .subresourceRange{
-            .aspectMask = aspect_mask,
+            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
             .baseMipLevel = base_level,
             .levelCount = 1,
-            .baseArrayLayer = base_layer,
+            .baseArrayLayer = 0,
             .layerCount = 1,
         },
     });
@@ -606,17 +586,12 @@ BlitImageHelper::BlitImageHelper(const Device& device_, Scheduler& scheduler_,
       msaa_copy_pipeline_layout(device.GetLogical().CreatePipelineLayout(PipelineLayoutCreateInfo(
           one_texture_set_layout.address(),
           PUSH_CONSTANT_RANGE<VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(MSAACopyPushConstants)>))),
-      msaa_copy_depth_stencil_pipeline_layout(
-          device.GetLogical().CreatePipelineLayout(PipelineLayoutCreateInfo(
-              two_textures_set_layout.address(),
-              PUSH_CONSTANT_RANGE<VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(MSAACopyPushConstants)>))),
       full_screen_vert(BuildShader(device, FULL_SCREEN_TRIANGLE_VERT_SPV)),
       blit_color_to_color_frag(BuildShader(device, BLIT_COLOR_FLOAT_FRAG_SPV)),
       blit_color_msaa_frag(BuildShader(device, BLIT_COLOR_MSAA_FRAG_SPV)),
       blit_depth_stencil_frag(device.IsExtShaderStencilExportSupported()
                              ? BuildShader(device, VULKAN_BLIT_DEPTH_STENCIL_FRAG_SPV)
                              : vk::ShaderModule{}),
-      blit_depth_frag(BuildShader(device, BLIT_DEPTH_FRAG_SPV)),
       blit_depth_msaa_frag(BuildShader(device, BLIT_DEPTH_MSAA_FRAG_SPV)),
       blit_depth_stencil_msaa_frag(device.IsExtShaderStencilExportSupported()
                              ? BuildShader(device, BLIT_DEPTH_STENCIL_MSAA_FRAG_SPV)
@@ -634,25 +609,7 @@ BlitImageHelper::BlitImageHelper(const Device& device_, Scheduler& scheduler_,
       convert_d24s8_to_abgr8_frag(BuildShader(device, CONVERT_D24S8_TO_ABGR8_FRAG_SPV)),
       convert_s8d24_to_abgr8_frag(BuildShader(device, CONVERT_S8D24_TO_ABGR8_FRAG_SPV)),
       convert_msaa_to_non_msaa_frag(BuildShader(device, CONVERT_MSAA_TO_NON_MSAA_FRAG_SPV)),
-      convert_msaa_to_non_msaa_sint_frag(
-          BuildShader(device, CONVERT_MSAA_TO_NON_MSAA_SINT_FRAG_SPV)),
-      convert_msaa_to_non_msaa_uint_frag(
-          BuildShader(device, CONVERT_MSAA_TO_NON_MSAA_UINT_FRAG_SPV)),
-      convert_msaa_to_non_msaa_depth_frag(
-          BuildShader(device, CONVERT_MSAA_TO_NON_MSAA_DEPTH_FRAG_SPV)),
-      convert_msaa_to_non_msaa_depth_stencil_frag(
-          BuildShader(device, CONVERT_MSAA_TO_NON_MSAA_DEPTH_STENCIL_FRAG_SPV)),
       convert_non_msaa_to_msaa_frag(BuildShader(device, CONVERT_NON_MSAA_TO_MSAA_FRAG_SPV)),
-      convert_non_msaa_to_msaa_sint_frag(
-          BuildShader(device, CONVERT_NON_MSAA_TO_MSAA_SINT_FRAG_SPV)),
-      convert_non_msaa_to_msaa_uint_frag(
-          BuildShader(device, CONVERT_NON_MSAA_TO_MSAA_UINT_FRAG_SPV)),
-      convert_non_msaa_to_msaa_depth_frag(
-          BuildShader(device, CONVERT_NON_MSAA_TO_MSAA_DEPTH_FRAG_SPV)),
-      convert_non_msaa_to_msaa_depth_stencil_frag(
-          device.IsExtShaderStencilExportSupported()
-              ? BuildShader(device, CONVERT_NON_MSAA_TO_MSAA_DEPTH_STENCIL_FRAG_SPV)
-              : vk::ShaderModule{}),
       linear_sampler(device.GetLogical().CreateSampler(SAMPLER_CREATE_INFO<VK_FILTER_LINEAR>)),
       nearest_sampler(device.GetLogical().CreateSampler(SAMPLER_CREATE_INFO<VK_FILTER_NEAREST>)) {}
 
@@ -667,13 +624,24 @@ void BlitImageHelper::BlitColor(const Framebuffer* dst_framebuffer, const ImageV
         .renderpass = dst_framebuffer->RenderPass(),
         .operation = operation,
     };
-    VkSampler sampler = *nearest_sampler;
-    if (is_linear) {
-        sampler = *linear_sampler;
-    }
-    BlitImpl(dst_framebuffer, src_image_view, dst_region, src_region,
-             FindOrEmplaceColorPipeline(key), sampler,
-             src_image_view.Handle(Shader::TextureType::Color2D), VK_NULL_HANDLE, false);
+    const VkPipelineLayout layout = *one_texture_pipeline_layout;
+    const VkSampler sampler = is_linear ? *linear_sampler : *nearest_sampler;
+    const VkPipeline pipeline = FindOrEmplaceColorPipeline(key);
+    const VkImageView src_view = src_image_view.Handle(Shader::TextureType::Color2D);
+
+    RecordShaderReadBarrier(scheduler, src_image_view);
+    scheduler.RequestRenderpass(dst_framebuffer);
+    scheduler.Record([this, dst_region, src_region, pipeline, layout, sampler,
+                      src_view](vk::CommandBuffer cmdbuf) {
+        const VkDescriptorSet descriptor_set = one_texture_descriptor_allocator.Commit();
+        UpdateOneTextureDescriptorSet(device, descriptor_set, sampler, src_view);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
+                                  nullptr);
+        BindBlitState(cmdbuf, layout, dst_region, src_region);
+        cmdbuf.Draw(3, 1, 0, 0);
+    });
+    scheduler.InvalidateState();
 }
 
 void BlitImageHelper::BlitColor(const Framebuffer* dst_framebuffer, VkImageView src_image_view,
@@ -702,29 +670,24 @@ void BlitImageHelper::BlitColor(const Framebuffer* dst_framebuffer, VkImageView
     });
 }
 
-void BlitImageHelper::BlitImpl(const Framebuffer* dst_framebuffer,
-                               const ImageView& src_image_view, const Region2D& dst_region,
-                               const Region2D& src_region, VkPipeline pipeline, VkSampler sampler,
-                               VkImageView src_view, VkImageView src_stencil_view,
-                               bool blit_stencil) {
-    VkPipelineLayout layout = *one_texture_pipeline_layout;
-    if (blit_stencil) {
-        layout = *two_textures_pipeline_layout;
-    }
+void BlitImageHelper::BlitColorMSAA(const Framebuffer* dst_framebuffer,
+                                    const ImageView& src_image_view, const Region2D& dst_region,
+                                    const Region2D& src_region) {
+    const BlitMSAAPipelineKey key{
+        .renderpass = dst_framebuffer->RenderPass(),
+        .samples = dst_framebuffer->Samples(),
+    };
+    const VkPipelineLayout layout = *one_texture_pipeline_layout;
+    const VkSampler sampler = *nearest_sampler;
+    const VkPipeline pipeline = FindOrEmplaceBlitColorMSAAPipeline(key);
+    const VkImageView src_view = src_image_view.Handle(Shader::TextureType::Color2D);
 
     RecordShaderReadBarrier(scheduler, src_image_view);
     scheduler.RequestRenderpass(dst_framebuffer);
-    scheduler.Record([this, dst_region, src_region, pipeline, layout, sampler, src_view,
-                      src_stencil_view, blit_stencil](vk::CommandBuffer cmdbuf) {
-        VkDescriptorSet descriptor_set = VK_NULL_HANDLE;
-        if (blit_stencil) {
-            descriptor_set = two_textures_descriptor_allocator.Commit();
-            UpdateTwoTexturesDescriptorSet(device, descriptor_set, sampler, src_view,
-                                           src_stencil_view);
-        } else {
-            descriptor_set = one_texture_descriptor_allocator.Commit();
-            UpdateOneTextureDescriptorSet(device, descriptor_set, sampler, src_view);
-        }
+    scheduler.Record([this, dst_region, src_region, pipeline, layout, sampler,
+                      src_view](vk::CommandBuffer cmdbuf) {
+        const VkDescriptorSet descriptor_set = one_texture_descriptor_allocator.Commit();
+        UpdateOneTextureDescriptorSet(device, descriptor_set, sampler, src_view);
         cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
         cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
                                   nullptr);
@@ -734,56 +697,41 @@ void BlitImageHelper::BlitImpl(const Framebuffer* dst_framebuffer,
     scheduler.InvalidateState();
 }
 
-void BlitImageHelper::BlitColorMSAA(const Framebuffer* dst_framebuffer,
-                                    const ImageView& src_image_view, const Region2D& dst_region,
-                                    const Region2D& src_region) {
-    const BlitMSAAPipelineKey key{
-        .renderpass = dst_framebuffer->RenderPass(),
-        .samples = dst_framebuffer->Samples(),
-    };
-    BlitImpl(dst_framebuffer, src_image_view, dst_region, src_region,
-             FindOrEmplaceBlitColorMSAAPipeline(key), *nearest_sampler,
-             src_image_view.Handle(Shader::TextureType::Color2D), VK_NULL_HANDLE, false);
-}
-
-void BlitImageHelper::BlitDepthStencilMSAA(const Framebuffer* dst_framebuffer,
-                                           ImageView& src_image_view, const Region2D& dst_region,
-                                           const Region2D& src_region) {
-    const bool blit_stencil =
-        dst_framebuffer->HasAspectStencilBit() && device.IsExtShaderStencilExportSupported();
-    const BlitMSAAPipelineKey key{
-        .renderpass = dst_framebuffer->RenderPass(),
-        .samples = dst_framebuffer->Samples(),
-    };
-    VkImageView src_stencil_view = VK_NULL_HANDLE;
-    if (blit_stencil) {
-        src_stencil_view = src_image_view.StencilView();
-    }
-    BlitImpl(dst_framebuffer, src_image_view, dst_region, src_region,
-             FindOrEmplaceBlitDepthStencilMSAAPipeline(key, blit_stencil), *nearest_sampler,
-             src_image_view.DepthView(), src_stencil_view, blit_stencil);
-}
-
-void BlitImageHelper::BlitDepth(const Framebuffer* dst_framebuffer, ImageView& src_image_view,
-                                const Region2D& dst_region, const Region2D& src_region) {
-    BlitImpl(dst_framebuffer, src_image_view, dst_region, src_region,
-             FindOrEmplaceBlitDepthPipeline(dst_framebuffer->RenderPass()), *nearest_sampler,
-             src_image_view.DepthView(), VK_NULL_HANDLE, false);
-}
-
 void BlitImageHelper::ResolveDepthStencil(const Framebuffer* dst_framebuffer,
                                           ImageView& src_image_view, const Region2D& dst_region,
                                           const Region2D& src_region) {
     const bool resolve_stencil =
         dst_framebuffer->HasAspectStencilBit() && device.IsExtShaderStencilExportSupported();
-    VkImageView src_stencil_view = VK_NULL_HANDLE;
-    if (resolve_stencil) {
-        src_stencil_view = src_image_view.StencilView();
-    }
-    BlitImpl(dst_framebuffer, src_image_view, dst_region, src_region,
-             FindOrEmplaceResolveDepthStencilPipeline(dst_framebuffer->RenderPass(),
-                                                      resolve_stencil),
-             *nearest_sampler, src_image_view.DepthView(), src_stencil_view, resolve_stencil);
+    const VkPipeline pipeline =
+        FindOrEmplaceResolveDepthStencilPipeline(dst_framebuffer->RenderPass(), resolve_stencil);
+    const VkPipelineLayout layout =
+        resolve_stencil ? *two_textures_pipeline_layout : *one_texture_pipeline_layout;
+    const VkSampler sampler = *nearest_sampler;
+    const VkImageView src_depth_view = src_image_view.DepthView();
+    const VkImageView src_stencil_view =
+        resolve_stencil ? src_image_view.StencilView() : VK_NULL_HANDLE;
+
+    RecordShaderReadBarrier(scheduler, src_image_view);
+    scheduler.RequestRenderpass(dst_framebuffer);
+    scheduler.Record([this, dst_region, src_region, pipeline, layout, sampler, src_depth_view,
+                      src_stencil_view, resolve_stencil](vk::CommandBuffer cmdbuf) {
+        if (resolve_stencil) {
+            const VkDescriptorSet descriptor_set = two_textures_descriptor_allocator.Commit();
+            UpdateTwoTexturesDescriptorSet(device, descriptor_set, sampler, src_depth_view,
+                                           src_stencil_view);
+            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
+                                      nullptr);
+        } else {
+            const VkDescriptorSet descriptor_set = one_texture_descriptor_allocator.Commit();
+            UpdateOneTextureDescriptorSet(device, descriptor_set, sampler, src_depth_view);
+            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
+                                      nullptr);
+        }
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+        BindBlitState(cmdbuf, layout, dst_region, src_region);
+        cmdbuf.Draw(3, 1, 0, 0);
+    });
+    scheduler.InvalidateState();
 }
 
 void BlitImageHelper::BlitDepthStencil(const Framebuffer* dst_framebuffer,
@@ -791,23 +739,35 @@ void BlitImageHelper::BlitDepthStencil(const Framebuffer* dst_framebuffer,
                                        const Region2D& dst_region, const Region2D& src_region,
                                        Tegra::Engines::Fermi2D::Filter filter,
                                        Tegra::Engines::Fermi2D::Operation operation) {
+    if (!device.IsExtShaderStencilExportSupported()) {
+        return;
+    }
     ASSERT(filter == Tegra::Engines::Fermi2D::Filter::Point);
     ASSERT(operation == Tegra::Engines::Fermi2D::Operation::SrcCopy);
-    const bool blit_stencil = device.IsExtShaderStencilExportSupported();
     const BlitImagePipelineKey key{
         .renderpass = dst_framebuffer->RenderPass(),
         .operation = operation,
     };
-    VkPipeline pipeline{};
-    VkImageView src_stencil_view = VK_NULL_HANDLE;
-    if (blit_stencil) {
-        pipeline = FindOrEmplaceDepthStencilPipeline(key);
-        src_stencil_view = src_image_view.StencilView();
-    } else {
-        pipeline = FindOrEmplaceBlitDepthPipeline(key.renderpass);
-    }
-    BlitImpl(dst_framebuffer, src_image_view, dst_region, src_region, pipeline, *nearest_sampler,
-             src_image_view.DepthView(), src_stencil_view, blit_stencil);
+    const VkPipelineLayout layout = *two_textures_pipeline_layout;
+    const VkSampler sampler = *nearest_sampler;
+    const VkPipeline pipeline = FindOrEmplaceDepthStencilPipeline(key);
+    const VkImageView src_depth_view = src_image_view.DepthView();
+    const VkImageView src_stencil_view = src_image_view.StencilView();
+
+    RecordShaderReadBarrier(scheduler, src_image_view);
+    scheduler.RequestRenderpass(dst_framebuffer);
+    scheduler.Record([dst_region, src_region, pipeline, layout, sampler, src_depth_view,
+                      src_stencil_view, this](vk::CommandBuffer cmdbuf) {
+        const VkDescriptorSet descriptor_set = two_textures_descriptor_allocator.Commit();
+        UpdateTwoTexturesDescriptorSet(device, descriptor_set, sampler, src_depth_view,
+                                       src_stencil_view);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
+                                  nullptr);
+        BindBlitState(cmdbuf, layout, dst_region, src_region);
+        cmdbuf.Draw(3, 1, 0, 0);
+    });
+    scheduler.InvalidateState();
 }
 
 void BlitImageHelper::ConvertD32ToR32(const Framebuffer* dst_framebuffer,
@@ -922,183 +882,19 @@ void BlitImageHelper::ClearDepthStencil(const Framebuffer* dst_framebuffer, bool
     scheduler.InvalidateState();
 }
 
-void BlitImageHelper::CopyMSAAImpl(VkRenderPass renderpass, VkPipeline pipeline,
-                                   VkPipelineLayout layout, VkImage dst_image,
-                                   VkFormat dst_vk_format, VkImage src_image,
-                                   VkFormat src_vk_format, s32 scale_x, s32 scale_y,
-                                   std::span<const VideoCommon::ImageCopy> copies,
-                                   const MSAACopyAspectInfo& aspect_info, bool copy_stencil) {
-    while (!msaa_copy_resources.empty() && scheduler.IsFree(msaa_copy_resources.front().tick)) {
-        msaa_copy_resources.pop_front();
-    }
-    const VkSampler sampler = *nearest_sampler;
-    for (const VideoCommon::ImageCopy& copy : copies) {
-        const s32 num_layers = (std::min)(copy.src_subresource.num_layers,
-                                          copy.dst_subresource.num_layers);
-        for (s32 layer = 0; layer < num_layers; ++layer) {
-            const u32 src_level = static_cast<u32>(copy.src_subresource.base_level);
-            const u32 src_layer = static_cast<u32>(copy.src_subresource.base_layer + layer);
-            vk::ImageView src_view =
-                MakeMSAACopyView(device.GetLogical(), src_image, src_vk_format, src_level,
-                                 src_layer, aspect_info.src_view_aspect);
-            vk::ImageView src_stencil_view;
-            if (copy_stencil) {
-                src_stencil_view =
-                    MakeMSAACopyView(device.GetLogical(), src_image, src_vk_format, src_level,
-                                     src_layer, VK_IMAGE_ASPECT_STENCIL_BIT);
-            }
-            vk::ImageView dst_view =
-                MakeMSAACopyView(device.GetLogical(), dst_image, dst_vk_format,
-                                 static_cast<u32>(copy.dst_subresource.base_level),
-                                 static_cast<u32>(copy.dst_subresource.base_layer + layer),
-                                 aspect_info.attachment_aspect);
-            const VkOffset2D dst_offset{copy.dst_offset.x, copy.dst_offset.y};
-            const VkExtent2D dst_extent{copy.extent.width, copy.extent.height};
-            const VkRect2D render_area{
-                .offset = dst_offset,
-                .extent = dst_extent,
-            };
-            vk::Framebuffer framebuffer = device.GetLogical().CreateFramebuffer(VkFramebufferCreateInfo{
-                .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
-                .pNext = nullptr,
-                .flags = 0,
-                .renderPass = renderpass,
-                .attachmentCount = 1,
-                .pAttachments = dst_view.address(),
-                .width = static_cast<u32>(dst_offset.x) + dst_extent.width,
-                .height = static_cast<u32>(dst_offset.y) + dst_extent.height,
-                .layers = 1,
-            });
-            const MSAACopyPushConstants push_constants{
-                .dst_offset = {dst_offset.x, dst_offset.y},
-                .src_offset = {copy.src_offset.x, copy.src_offset.y},
-                .scale = {scale_x, scale_y},
-            };
-            VkImageView src_stencil_handle = VK_NULL_HANDLE;
-            if (copy_stencil) {
-                src_stencil_handle = *src_stencil_view;
-            }
-            scheduler.RequestOutsideRenderPassOperationContext();
-            scheduler.Record([this, pipeline, layout, sampler, renderpass,
-                              framebuffer_handle = *framebuffer, src_view_handle = *src_view,
-                              src_stencil_handle, src = src_image, dst = dst_image, render_area,
-                              aspect_info, push_constants](vk::CommandBuffer cmdbuf) {
-                const VkImageSubresourceRange barrier_range{
-                    .aspectMask = aspect_info.barrier_aspect,
-                    .baseMipLevel = 0,
-                    .levelCount = VK_REMAINING_MIP_LEVELS,
-                    .baseArrayLayer = 0,
-                    .layerCount = VK_REMAINING_ARRAY_LAYERS,
-                };
-                const std::array pre_barriers{
-                    VkImageMemoryBarrier{
-                        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-                        .pNext = nullptr,
-                        .srcAccessMask = aspect_info.pre_src_access,
-                        .dstAccessMask = aspect_info.pre_src_dst_access,
-                        .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
-                        .newLayout = VK_IMAGE_LAYOUT_GENERAL,
-                        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-                        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-                        .image = src,
-                        .subresourceRange = barrier_range,
-                    },
-                    VkImageMemoryBarrier{
-                        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-                        .pNext = nullptr,
-                        .srcAccessMask = aspect_info.pre_src_access,
-                        .dstAccessMask = aspect_info.pre_dst_dst_access,
-                        .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
-                        .newLayout = VK_IMAGE_LAYOUT_GENERAL,
-                        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-                        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-                        .image = dst,
-                        .subresourceRange = barrier_range,
-                    },
-                };
-                cmdbuf.PipelineBarrier(aspect_info.pre_src_stages, aspect_info.pre_dst_stages, 0,
-                                       nullptr, nullptr, pre_barriers);
-                const VkRenderPassBeginInfo renderpass_bi{
-                    .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
-                    .pNext = nullptr,
-                    .renderPass = renderpass,
-                    .framebuffer = framebuffer_handle,
-                    .renderArea = render_area,
-                    .clearValueCount = 0,
-                    .pClearValues = nullptr,
-                };
-                cmdbuf.BeginRenderPass(renderpass_bi, VK_SUBPASS_CONTENTS_INLINE);
-                VkDescriptorSet descriptor_set = VK_NULL_HANDLE;
-                if (src_stencil_handle != VK_NULL_HANDLE) {
-                    descriptor_set = two_textures_descriptor_allocator.Commit();
-                    UpdateTwoTexturesDescriptorSet(device, descriptor_set, sampler, src_view_handle,
-                                                   src_stencil_handle);
-                } else {
-                    descriptor_set = one_texture_descriptor_allocator.Commit();
-                    UpdateOneTextureDescriptorSet(device, descriptor_set, sampler, src_view_handle);
-                }
-                cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
-                cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
-                                          nullptr);
-                const VkViewport viewport{
-                    .x = static_cast<float>(render_area.offset.x),
-                    .y = static_cast<float>(render_area.offset.y),
-                    .width = static_cast<float>(render_area.extent.width),
-                    .height = static_cast<float>(render_area.extent.height),
-                    .minDepth = 0.0f,
-                    .maxDepth = 1.0f,
-                };
-                cmdbuf.SetViewport(0, viewport);
-                cmdbuf.SetScissor(0, render_area);
-                cmdbuf.PushConstants(layout, VK_SHADER_STAGE_FRAGMENT_BIT, push_constants);
-                cmdbuf.Draw(3, 1, 0, 0);
-                cmdbuf.EndRenderPass();
-                const VkImageMemoryBarrier post_barrier{
-                    .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-                    .pNext = nullptr,
-                    .srcAccessMask = aspect_info.post_src_access,
-                    .dstAccessMask = aspect_info.post_dst_access,
-                    .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
-                    .newLayout = VK_IMAGE_LAYOUT_GENERAL,
-                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-                    .image = dst,
-                    .subresourceRange = barrier_range,
-                };
-                cmdbuf.PipelineBarrier(aspect_info.post_src_stages, aspect_info.post_dst_stages, 0,
-                                       post_barrier);
-            });
-            msaa_copy_resources.push_back(MSAACopyResources{
-                .tick = scheduler.CurrentTick(),
-                .src_view = std::move(src_view),
-                .dst_view = std::move(dst_view),
-                .framebuffer = std::move(framebuffer),
-            });
-            if (copy_stencil) {
-                msaa_copy_resources.push_back(MSAACopyResources{
-                    .tick = scheduler.CurrentTick(),
-                    .src_view = std::move(src_stencil_view),
-                    .dst_view = vk::ImageView{},
-                    .framebuffer = vk::Framebuffer{},
-                });
-            }
-        }
-    }
-    scheduler.InvalidateState();
-}
-
 void BlitImageHelper::CopyMSAA(RenderPassCache& render_pass_cache, VkImage dst_image,
                                VideoCore::Surface::PixelFormat dst_format, VkImage src_image,
                                VideoCore::Surface::PixelFormat src_format, u32 num_samples,
                                std::span<const VideoCommon::ImageCopy> copies,
                                bool msaa_to_non_msaa) {
+    while (!msaa_copy_resources.empty() && scheduler.IsFree(msaa_copy_resources.front().tick)) {
+        msaa_copy_resources.pop_front();
+    }
     const auto [samples_x, samples_y] = VideoCommon::SamplesLog2(static_cast<int>(num_samples));
     const s32 scale_x = 1 << samples_x;
     const s32 scale_y = 1 << samples_y;
-    VkSampleCountFlagBits samples = SampleCountFlag(num_samples);
-    if (msaa_to_non_msaa) {
-        samples = VK_SAMPLE_COUNT_1_BIT;
-    }
+    const VkSampleCountFlagBits samples =
+        msaa_to_non_msaa ? VK_SAMPLE_COUNT_1_BIT : SampleCountFlag(num_samples);
     RenderPassKey renderpass_key{};
     renderpass_key.color_formats.fill(VideoCore::Surface::PixelFormat::Invalid);
     renderpass_key.color_formats[0] = dst_format;
@@ -1109,35 +905,149 @@ void BlitImageHelper::CopyMSAA(RenderPassCache& render_pass_cache, VkImage dst_i
         .renderpass = renderpass,
         .samples = samples,
         .msaa_to_non_msaa = msaa_to_non_msaa,
-        .format_class = FormatClass(dst_format),
-    };
-    const MSAACopyAspectInfo aspect_info{
-        .src_view_aspect = VK_IMAGE_ASPECT_COLOR_BIT,
-        .attachment_aspect = VK_IMAGE_ASPECT_COLOR_BIT,
-        .barrier_aspect = VK_IMAGE_ASPECT_COLOR_BIT,
-        .pre_src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_SHADER_WRITE_BIT |
-                          VK_ACCESS_TRANSFER_WRITE_BIT,
-        .pre_src_dst_access = VK_ACCESS_SHADER_READ_BIT,
-        .pre_dst_dst_access =
-            VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-        .pre_src_stages = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                          VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
-                          VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
-        .pre_dst_stages =
-            VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-        .post_src_access = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-        .post_dst_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT,
-        .post_src_stages = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-        .post_dst_stages = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
-                           VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
     };
+    const VkPipeline pipeline = FindOrEmplaceMSAACopyPipeline(key);
+    const VkPipelineLayout layout = *msaa_copy_pipeline_layout;
+    const VkSampler sampler = *nearest_sampler;
     const VkFormat src_vk_format =
         MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, true, src_format).format;
     const VkFormat dst_vk_format =
         MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, true, dst_format).format;
-    CopyMSAAImpl(renderpass, FindOrEmplaceMSAACopyPipeline(key), *msaa_copy_pipeline_layout,
-                 dst_image, dst_vk_format, src_image, src_vk_format, scale_x, scale_y, copies,
-                 aspect_info, false);
+    for (const VideoCommon::ImageCopy& copy : copies) {
+        ASSERT(copy.src_subresource.base_layer == 0);
+        ASSERT(copy.src_subresource.num_layers == 1);
+        ASSERT(copy.dst_subresource.base_layer == 0);
+        ASSERT(copy.dst_subresource.num_layers == 1);
+        vk::ImageView src_view =
+            MakeMSAACopyView(device.GetLogical(), src_image, src_vk_format,
+                             static_cast<u32>(copy.src_subresource.base_level));
+        vk::ImageView dst_view =
+            MakeMSAACopyView(device.GetLogical(), dst_image, dst_vk_format,
+                             static_cast<u32>(copy.dst_subresource.base_level));
+        const VkOffset2D dst_offset{copy.dst_offset.x, copy.dst_offset.y};
+        const VkExtent2D dst_extent{copy.extent.width, copy.extent.height};
+        const VkRect2D render_area{
+            .offset = dst_offset,
+            .extent = dst_extent,
+        };
+        vk::Framebuffer framebuffer = device.GetLogical().CreateFramebuffer(VkFramebufferCreateInfo{
+            .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
+            .pNext = nullptr,
+            .flags = 0,
+            .renderPass = renderpass,
+            .attachmentCount = 1,
+            .pAttachments = dst_view.address(),
+            .width = static_cast<u32>(dst_offset.x) + dst_extent.width,
+            .height = static_cast<u32>(dst_offset.y) + dst_extent.height,
+            .layers = 1,
+        });
+        const MSAACopyPushConstants push_constants{
+            .dst_offset = {dst_offset.x, dst_offset.y},
+            .src_offset = {copy.src_offset.x, copy.src_offset.y},
+            .scale = {scale_x, scale_y},
+        };
+        scheduler.RequestOutsideRenderPassOperationContext();
+        scheduler.Record([this, pipeline, layout, sampler, renderpass,
+                          framebuffer_handle = *framebuffer, src_view_handle = *src_view,
+                          src = src_image, dst = dst_image, render_area,
+                          push_constants](vk::CommandBuffer cmdbuf) {
+            constexpr VkImageSubresourceRange color_range{
+                .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            };
+            const std::array pre_barriers{
+                VkImageMemoryBarrier{
+                    .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+                    .pNext = nullptr,
+                    .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
+                                     VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,
+                    .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
+                    .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+                    .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .image = src,
+                    .subresourceRange = color_range,
+                },
+                VkImageMemoryBarrier{
+                    .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+                    .pNext = nullptr,
+                    .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
+                                     VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,
+                    .dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT |
+                                     VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+                    .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+                    .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+                    .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                    .image = dst,
+                    .subresourceRange = color_range,
+                },
+            };
+            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
+                                       VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
+                                       VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
+                                       VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                   VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
+                                       VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                   0, nullptr, nullptr, pre_barriers);
+            const VkRenderPassBeginInfo renderpass_bi{
+                .sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
+                .pNext = nullptr,
+                .renderPass = renderpass,
+                .framebuffer = framebuffer_handle,
+                .renderArea = render_area,
+                .clearValueCount = 0,
+                .pClearValues = nullptr,
+            };
+            cmdbuf.BeginRenderPass(renderpass_bi, VK_SUBPASS_CONTENTS_INLINE);
+            const VkDescriptorSet descriptor_set = one_texture_descriptor_allocator.Commit();
+            UpdateOneTextureDescriptorSet(device, descriptor_set, sampler, src_view_handle);
+            cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, layout, 0, descriptor_set,
+                                      nullptr);
+            const VkViewport viewport{
+                .x = static_cast<float>(render_area.offset.x),
+                .y = static_cast<float>(render_area.offset.y),
+                .width = static_cast<float>(render_area.extent.width),
+                .height = static_cast<float>(render_area.extent.height),
+                .minDepth = 0.0f,
+                .maxDepth = 1.0f,
+            };
+            cmdbuf.SetViewport(0, viewport);
+            cmdbuf.SetScissor(0, render_area);
+            cmdbuf.PushConstants(layout, VK_SHADER_STAGE_FRAGMENT_BIT, push_constants);
+            cmdbuf.Draw(3, 1, 0, 0);
+            cmdbuf.EndRenderPass();
+            const VkImageMemoryBarrier post_barrier{
+                .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+                .pNext = nullptr,
+                .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+                .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT,
+                .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+                .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+                .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                .image = dst,
+                .subresourceRange = color_range,
+            };
+            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                                   VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
+                                       VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
+                                       VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                   0, post_barrier);
+        });
+        msaa_copy_resources.push_back(MSAACopyResources{
+            .tick = scheduler.CurrentTick(),
+            .src_view = std::move(src_view),
+            .dst_view = std::move(dst_view),
+            .framebuffer = std::move(framebuffer),
+        });
+    }
+    scheduler.InvalidateState();
 }
 
 void BlitImageHelper::Convert(VkPipeline pipeline, const Framebuffer* dst_framebuffer,
@@ -1281,7 +1191,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceColorPipeline(const BlitImagePipelineKe
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *blit_color_pipelines.back();
 }
 
@@ -1313,7 +1223,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceDepthStencilPipeline(const BlitImagePip
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *blit_depth_stencil_pipelines.back();
 }
 
@@ -1366,7 +1276,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearColorPipeline(const BlitImagePipel
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *clear_color_pipelines.back();
 }
 
@@ -1422,7 +1332,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearStencilPipeline(
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *clear_stencil_pipelines.back();
 }
 
@@ -1465,91 +1375,10 @@ VkPipeline BlitImageHelper::FindOrEmplaceBlitColorMSAAPipeline(const BlitMSAAPip
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *blit_msaa_color_pipelines.back();
 }
 
-VkPipeline BlitImageHelper::FindOrEmplaceBlitDepthStencilMSAAPipeline(
-    const BlitMSAAPipelineKey& key, bool blit_stencil) {
-    auto& keys = blit_stencil ? blit_msaa_depth_stencil_keys : blit_msaa_depth_keys;
-    auto& pipelines = blit_stencil ? blit_msaa_depth_stencil_pipelines : blit_msaa_depth_pipelines;
-    const auto it = std::ranges::find(keys, key);
-    if (it != keys.end()) {
-        return *pipelines[std::distance(keys.begin(), it)];
-    }
-    keys.push_back(key);
-    const std::array stages =
-        MakeStages(*full_screen_vert,
-                   blit_stencil ? *blit_depth_stencil_msaa_frag : *blit_depth_msaa_frag);
-    const VkPipelineMultisampleStateCreateInfo multisample_ci{
-        .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .rasterizationSamples = key.samples,
-        .sampleShadingEnable = VK_TRUE,
-        .minSampleShading = 1.0f,
-        .pSampleMask = nullptr,
-        .alphaToCoverageEnable = VK_FALSE,
-        .alphaToOneEnable = VK_FALSE,
-    };
-    const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);
-    pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({
-        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .stageCount = static_cast<u32>(stages.size()),
-        .pStages = stages.data(),
-        .pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-        .pInputAssemblyState = &input_assembly_ci,
-        .pTessellationState = nullptr,
-        .pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,
-        .pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
-        .pMultisampleState = &multisample_ci,
-        .pDepthStencilState = blit_stencil ? &PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO
-                                           : &PIPELINE_DEPTH_ONLY_STATE_CREATE_INFO,
-        .pColorBlendState = &PIPELINE_COLOR_BLEND_STATE_EMPTY_CREATE_INFO,
-        .pDynamicState = &PIPELINE_DYNAMIC_STATE_CREATE_INFO,
-        .layout = blit_stencil ? *two_textures_pipeline_layout : *one_texture_pipeline_layout,
-        .renderPass = key.renderpass,
-        .subpass = 0,
-        .basePipelineHandle = VK_NULL_HANDLE,
-        .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
-    return *pipelines.back();
-}
-
-VkPipeline BlitImageHelper::FindOrEmplaceBlitDepthPipeline(VkRenderPass renderpass) {
-    const auto it = std::ranges::find(blit_depth_keys, renderpass);
-    if (it != blit_depth_keys.end()) {
-        return *blit_depth_pipelines[std::distance(blit_depth_keys.begin(), it)];
-    }
-    blit_depth_keys.push_back(renderpass);
-    const std::array stages = MakeStages(*full_screen_vert, *blit_depth_frag);
-    const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);
-    blit_depth_pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({
-        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .stageCount = static_cast<u32>(stages.size()),
-        .pStages = stages.data(),
-        .pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-        .pInputAssemblyState = &input_assembly_ci,
-        .pTessellationState = nullptr,
-        .pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,
-        .pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
-        .pMultisampleState = &PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
-        .pDepthStencilState = &PIPELINE_DEPTH_ONLY_STATE_CREATE_INFO,
-        .pColorBlendState = &PIPELINE_COLOR_BLEND_STATE_EMPTY_CREATE_INFO,
-        .pDynamicState = &PIPELINE_DYNAMIC_STATE_CREATE_INFO,
-        .layout = *one_texture_pipeline_layout,
-        .renderPass = renderpass,
-        .subpass = 0,
-        .basePipelineHandle = VK_NULL_HANDLE,
-        .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
-    return *blit_depth_pipelines.back();
-}
-
 VkPipeline BlitImageHelper::FindOrEmplaceResolveDepthStencilPipeline(VkRenderPass renderpass,
                                                                      bool resolve_stencil) {
     auto& keys = resolve_stencil ? resolve_depth_stencil_keys : resolve_depth_keys;
@@ -1584,87 +1413,19 @@ VkPipeline BlitImageHelper::FindOrEmplaceResolveDepthStencilPipeline(VkRenderPas
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *pipelines.back();
 }
 
-void BlitImageHelper::CopyMSAADepth(RenderPassCache& render_pass_cache, VkImage dst_image,
-                                    VideoCore::Surface::PixelFormat dst_format, VkImage src_image,
-                                    VideoCore::Surface::PixelFormat src_format, u32 num_samples,
-                                    std::span<const VideoCommon::ImageCopy> copies,
-                                    bool copy_stencil, bool msaa_to_non_msaa) {
-    const auto [samples_x, samples_y] = VideoCommon::SamplesLog2(static_cast<int>(num_samples));
-    const s32 scale_x = 1 << samples_x;
-    const s32 scale_y = 1 << samples_y;
-    VkSampleCountFlagBits samples = SampleCountFlag(num_samples);
-    if (msaa_to_non_msaa) {
-        samples = VK_SAMPLE_COUNT_1_BIT;
-    }
-    RenderPassKey renderpass_key{};
-    renderpass_key.color_formats.fill(VideoCore::Surface::PixelFormat::Invalid);
-    renderpass_key.depth_format = dst_format;
-    renderpass_key.samples = samples;
-    const VkRenderPass renderpass = render_pass_cache.Get(renderpass_key);
-    const MSAACopyPipelineKey key{
-        .renderpass = renderpass,
-        .samples = samples,
-        .msaa_to_non_msaa = msaa_to_non_msaa,
-        .format_class = MSAACopyFormatClass::Float,
-    };
-    VkImageAspectFlags attachment_aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
-    if (VideoCore::Surface::GetFormatType(dst_format) ==
-        VideoCore::Surface::SurfaceType::DepthStencil) {
-        attachment_aspect |= VK_IMAGE_ASPECT_STENCIL_BIT;
-    }
-    VkPipelineLayout layout = *msaa_copy_pipeline_layout;
-    if (copy_stencil) {
-        layout = *msaa_copy_depth_stencil_pipeline_layout;
-    }
-    const MSAACopyAspectInfo aspect_info{
-        .src_view_aspect = VK_IMAGE_ASPECT_DEPTH_BIT,
-        .attachment_aspect = attachment_aspect,
-        .barrier_aspect = attachment_aspect,
-        .pre_src_access =
-            VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,
-        .pre_src_dst_access = VK_ACCESS_SHADER_READ_BIT,
-        .pre_dst_dst_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
-                              VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-        .pre_src_stages = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
-                          VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-                          VK_PIPELINE_STAGE_TRANSFER_BIT,
-        .pre_dst_stages =
-            VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
-        .post_src_access = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-        .post_dst_access = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT |
-                           VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT,
-        .post_src_stages = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
-        .post_dst_stages = vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER,
-    };
-    const VkFormat src_vk_format =
-        MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, true, src_format).format;
-    const VkFormat dst_vk_format =
-        MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, true, dst_format).format;
-    CopyMSAAImpl(renderpass, FindOrEmplaceMSAACopyDepthPipeline(key, copy_stencil), layout,
-                 dst_image, dst_vk_format, src_image, src_vk_format, scale_x, scale_y, copies,
-                 aspect_info, copy_stencil);
-}
-
 VkPipeline BlitImageHelper::FindOrEmplaceMSAACopyPipeline(const MSAACopyPipelineKey& key) {
     const auto it = std::ranges::find(msaa_copy_keys, key);
     if (it != msaa_copy_keys.end()) {
         return *msaa_copy_pipelines[std::distance(msaa_copy_keys.begin(), it)];
     }
     msaa_copy_keys.push_back(key);
-    VkShaderModule frag_module = key.msaa_to_non_msaa ? *convert_msaa_to_non_msaa_frag
-                                                     : *convert_non_msaa_to_msaa_frag;
-    if (key.format_class == MSAACopyFormatClass::SignedInteger) {
-        frag_module = key.msaa_to_non_msaa ? *convert_msaa_to_non_msaa_sint_frag
-                                           : *convert_non_msaa_to_msaa_sint_frag;
-    } else if (key.format_class == MSAACopyFormatClass::UnsignedInteger) {
-        frag_module = key.msaa_to_non_msaa ? *convert_msaa_to_non_msaa_uint_frag
-                                           : *convert_non_msaa_to_msaa_uint_frag;
-    }
-    const std::array stages = MakeStages(*clear_color_vert, frag_module);
+    const std::array stages = MakeStages(*clear_color_vert, key.msaa_to_non_msaa
+                                                                ? *convert_msaa_to_non_msaa_frag
+                                                                : *convert_non_msaa_to_msaa_frag);
     const VkPipelineMultisampleStateCreateInfo multisample_ci{
         .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
         .pNext = nullptr,
@@ -1697,89 +1458,10 @@ VkPipeline BlitImageHelper::FindOrEmplaceMSAACopyPipeline(const MSAACopyPipeline
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
+    }));
     return *msaa_copy_pipelines.back();
 }
 
-VkPipeline BlitImageHelper::FindOrEmplaceMSAACopyDepthPipeline(const MSAACopyPipelineKey& key,
-                                                               bool copy_stencil) {
-    auto& keys = copy_stencil ? msaa_copy_depth_stencil_keys : msaa_copy_depth_keys;
-    auto& pipelines = copy_stencil ? msaa_copy_depth_stencil_pipelines : msaa_copy_depth_pipelines;
-    const auto it = std::ranges::find(keys, key);
-    if (it != keys.end()) {
-        return *pipelines[std::distance(keys.begin(), it)];
-    }
-    keys.push_back(key);
-    VkShaderModule frag_module;
-    if (key.msaa_to_non_msaa) {
-        frag_module = copy_stencil ? *convert_msaa_to_non_msaa_depth_stencil_frag
-                                   : *convert_msaa_to_non_msaa_depth_frag;
-    } else {
-        frag_module = copy_stencil ? *convert_non_msaa_to_msaa_depth_stencil_frag
-                                   : *convert_non_msaa_to_msaa_depth_frag;
-    }
-    const std::array stages = MakeStages(*clear_color_vert, frag_module);
-    const VkPipelineMultisampleStateCreateInfo multisample_ci{
-        .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .rasterizationSamples = key.samples,
-        .sampleShadingEnable = key.msaa_to_non_msaa ? VK_FALSE : VK_TRUE,
-        .minSampleShading = key.msaa_to_non_msaa ? 0.0f : 1.0f,
-        .pSampleMask = nullptr,
-        .alphaToCoverageEnable = VK_FALSE,
-        .alphaToOneEnable = VK_FALSE,
-    };
-    static constexpr VkStencilOpState REPLACE_STENCIL_OP{
-        .failOp = VK_STENCIL_OP_REPLACE,
-        .passOp = VK_STENCIL_OP_REPLACE,
-        .depthFailOp = VK_STENCIL_OP_REPLACE,
-        .compareOp = VK_COMPARE_OP_ALWAYS,
-        .compareMask = 0xFF,
-        .writeMask = 0xFF,
-        .reference = 0,
-    };
-    const VkPipelineDepthStencilStateCreateInfo depth_stencil_ci{
-        .sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .depthTestEnable = VK_TRUE,
-        .depthWriteEnable = VK_TRUE,
-        .depthCompareOp = VK_COMPARE_OP_ALWAYS,
-        .depthBoundsTestEnable = VK_FALSE,
-        .stencilTestEnable = copy_stencil ? VK_TRUE : VK_FALSE,
-        .front = copy_stencil ? REPLACE_STENCIL_OP : VkStencilOpState{},
-        .back = copy_stencil ? REPLACE_STENCIL_OP : VkStencilOpState{},
-        .minDepthBounds = 0.0f,
-        .maxDepthBounds = 0.0f,
-    };
-    const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci =
-        GetPipelineInputAssemblyStateCreateInfo(device);
-    pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({
-        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .stageCount = static_cast<u32>(stages.size()),
-        .pStages = stages.data(),
-        .pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-        .pInputAssemblyState = &input_assembly_ci,
-        .pTessellationState = nullptr,
-        .pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,
-        .pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
-        .pMultisampleState = &multisample_ci,
-        .pDepthStencilState = &depth_stencil_ci,
-        .pColorBlendState = &PIPELINE_COLOR_BLEND_STATE_EMPTY_CREATE_INFO,
-        .pDynamicState = &PIPELINE_DYNAMIC_STATE_CREATE_INFO,
-        .layout = copy_stencil ? *msaa_copy_depth_stencil_pipeline_layout
-                               : *msaa_copy_pipeline_layout,
-        .renderPass = key.renderpass,
-        .subpass = 0,
-        .basePipelineHandle = VK_NULL_HANDLE,
-        .basePipelineIndex = 0,
-    }, device.StaticPipelineCache()));
-    return *pipelines.back();
-}
-
 void BlitImageHelper::ConvertDepthToColorPipeline(vk::Pipeline& pipeline, VkRenderPass renderpass) {
     ConvertPipeline(pipeline, renderpass, false);
 }
@@ -1817,7 +1499,7 @@ void BlitImageHelper::ConvertPipelineEx(vk::Pipeline& pipeline, VkRenderPass ren
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache());
+    });
 }
 
 void BlitImageHelper::ConvertPipelineColorTargetEx(vk::Pipeline& pipeline, VkRenderPass renderpass,
@@ -1860,7 +1542,7 @@ void BlitImageHelper::ConvertPipeline(vk::Pipeline& pipeline, VkRenderPass rende
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }, device.StaticPipelineCache());
+    });
 }
 
 } // namespace Vulkan

src/video_core/renderer_vulkan/blit_image.h

@@ -45,19 +45,12 @@ struct BlitDepthStencilPipelineKey {
     u32 stencil_ref;
 };
 
-enum class MSAACopyFormatClass : u32 {
-    Float,
-    SignedInteger,
-    UnsignedInteger,
-};
-
 struct MSAACopyPipelineKey {
     constexpr auto operator<=>(const MSAACopyPipelineKey&) const noexcept = default;
 
     VkRenderPass renderpass;
     VkSampleCountFlagBits samples;
     bool msaa_to_non_msaa;
-    MSAACopyFormatClass format_class;
 };
 
 struct BlitMSAAPipelineKey {
@@ -85,12 +78,6 @@ public:
     void BlitColorMSAA(const Framebuffer* dst_framebuffer, const ImageView& src_image_view,
                        const Region2D& dst_region, const Region2D& src_region);
 
-    void BlitDepthStencilMSAA(const Framebuffer* dst_framebuffer, ImageView& src_image_view,
-                              const Region2D& dst_region, const Region2D& src_region);
-
-    void BlitDepth(const Framebuffer* dst_framebuffer, ImageView& src_image_view,
-                   const Region2D& dst_region, const Region2D& src_region);
-
     void ResolveDepthStencil(const Framebuffer* dst_framebuffer, ImageView& src_image_view,
                              const Region2D& dst_region, const Region2D& src_region);
 
@@ -129,39 +116,7 @@ public:
                   VideoCore::Surface::PixelFormat src_format, u32 num_samples,
                   std::span<const VideoCommon::ImageCopy> copies, bool msaa_to_non_msaa);
 
-    void CopyMSAADepth(RenderPassCache& render_pass_cache, VkImage dst_image,
-                       VideoCore::Surface::PixelFormat dst_format, VkImage src_image,
-                       VideoCore::Surface::PixelFormat src_format, u32 num_samples,
-                       std::span<const VideoCommon::ImageCopy> copies, bool copy_stencil,
-                       bool msaa_to_non_msaa);
-
 private:
-    struct MSAACopyAspectInfo {
-        VkImageAspectFlags src_view_aspect;
-        VkImageAspectFlags attachment_aspect;
-        VkImageAspectFlags barrier_aspect;
-        VkAccessFlags pre_src_access;
-        VkAccessFlags pre_src_dst_access;
-        VkAccessFlags pre_dst_dst_access;
-        VkPipelineStageFlags pre_src_stages;
-        VkPipelineStageFlags pre_dst_stages;
-        VkAccessFlags post_src_access;
-        VkAccessFlags post_dst_access;
-        VkPipelineStageFlags post_src_stages;
-        VkPipelineStageFlags post_dst_stages;
-    };
-
-    void BlitImpl(const Framebuffer* dst_framebuffer, const ImageView& src_image_view,
-                  const Region2D& dst_region, const Region2D& src_region, VkPipeline pipeline,
-                  VkSampler sampler, VkImageView src_view, VkImageView src_stencil_view,
-                  bool blit_stencil);
-
-    void CopyMSAAImpl(VkRenderPass renderpass, VkPipeline pipeline, VkPipelineLayout layout,
-                      VkImage dst_image, VkFormat dst_vk_format, VkImage src_image,
-                      VkFormat src_vk_format, s32 scale_x, s32 scale_y,
-                      std::span<const VideoCommon::ImageCopy> copies,
-                      const MSAACopyAspectInfo& aspect_info, bool copy_stencil);
-
     void Convert(VkPipeline pipeline, const Framebuffer* dst_framebuffer,
                  const ImageView& src_image_view);
 
@@ -176,13 +131,7 @@ private:
     [[nodiscard]] VkPipeline FindOrEmplaceClearStencilPipeline(
         const BlitDepthStencilPipelineKey& key);
     [[nodiscard]] VkPipeline FindOrEmplaceMSAACopyPipeline(const MSAACopyPipelineKey& key);
-
-    [[nodiscard]] VkPipeline FindOrEmplaceMSAACopyDepthPipeline(const MSAACopyPipelineKey& key,
-                                                                bool copy_stencil);
     [[nodiscard]] VkPipeline FindOrEmplaceBlitColorMSAAPipeline(const BlitMSAAPipelineKey& key);
-    [[nodiscard]] VkPipeline FindOrEmplaceBlitDepthStencilMSAAPipeline(
-        const BlitMSAAPipelineKey& key, bool blit_stencil);
-    [[nodiscard]] VkPipeline FindOrEmplaceBlitDepthPipeline(VkRenderPass renderpass);
     [[nodiscard]] VkPipeline FindOrEmplaceResolveDepthStencilPipeline(VkRenderPass renderpass,
                                                                       bool resolve_stencil);
 
@@ -213,12 +162,10 @@ private:
     vk::PipelineLayout two_textures_pipeline_layout;
     vk::PipelineLayout clear_color_pipeline_layout;
     vk::PipelineLayout msaa_copy_pipeline_layout;
-    vk::PipelineLayout msaa_copy_depth_stencil_pipeline_layout;
     vk::ShaderModule full_screen_vert;
     vk::ShaderModule blit_color_to_color_frag;
     vk::ShaderModule blit_color_msaa_frag;
     vk::ShaderModule blit_depth_stencil_frag;
-    vk::ShaderModule blit_depth_frag;
     vk::ShaderModule blit_depth_msaa_frag;
     vk::ShaderModule blit_depth_stencil_msaa_frag;
     vk::ShaderModule clear_color_vert;
@@ -232,15 +179,7 @@ private:
     vk::ShaderModule convert_d24s8_to_abgr8_frag;
     vk::ShaderModule convert_s8d24_to_abgr8_frag;
     vk::ShaderModule convert_msaa_to_non_msaa_frag;
-    vk::ShaderModule convert_msaa_to_non_msaa_sint_frag;
-    vk::ShaderModule convert_msaa_to_non_msaa_uint_frag;
-    vk::ShaderModule convert_msaa_to_non_msaa_depth_frag;
-    vk::ShaderModule convert_msaa_to_non_msaa_depth_stencil_frag;
     vk::ShaderModule convert_non_msaa_to_msaa_frag;
-    vk::ShaderModule convert_non_msaa_to_msaa_sint_frag;
-    vk::ShaderModule convert_non_msaa_to_msaa_uint_frag;
-    vk::ShaderModule convert_non_msaa_to_msaa_depth_frag;
-    vk::ShaderModule convert_non_msaa_to_msaa_depth_stencil_frag;
     vk::Sampler linear_sampler;
     vk::Sampler nearest_sampler;
 
@@ -254,18 +193,8 @@ private:
     std::vector<vk::Pipeline> clear_stencil_pipelines;
     std::vector<MSAACopyPipelineKey> msaa_copy_keys;
     std::vector<vk::Pipeline> msaa_copy_pipelines;
-    std::vector<MSAACopyPipelineKey> msaa_copy_depth_keys;
-    std::vector<vk::Pipeline> msaa_copy_depth_pipelines;
-    std::vector<MSAACopyPipelineKey> msaa_copy_depth_stencil_keys;
-    std::vector<vk::Pipeline> msaa_copy_depth_stencil_pipelines;
     std::vector<BlitMSAAPipelineKey> blit_msaa_color_keys;
     std::vector<vk::Pipeline> blit_msaa_color_pipelines;
-    std::vector<VkRenderPass> blit_depth_keys;
-    std::vector<vk::Pipeline> blit_depth_pipelines;
-    std::vector<BlitMSAAPipelineKey> blit_msaa_depth_keys;
-    std::vector<vk::Pipeline> blit_msaa_depth_pipelines;
-    std::vector<BlitMSAAPipelineKey> blit_msaa_depth_stencil_keys;
-    std::vector<vk::Pipeline> blit_msaa_depth_stencil_pipelines;
     std::vector<VkRenderPass> resolve_depth_keys;
     std::vector<vk::Pipeline> resolve_depth_pipelines;
     std::vector<VkRenderPass> resolve_depth_stencil_keys;

src/video_core/renderer_vulkan/fixed_pipeline_state.cpp

@@ -141,7 +141,6 @@ void FixedPipelineState::Refresh(Tegra::Engines::Maxwell3D& maxwell3d, DynamicFe
     depth_enabled.Assign(regs.zeta_enable != 0 ? 1 : 0);
     depth_format.Assign(static_cast<u32>(regs.zeta.format));
     y_negate.Assign(regs.window_origin.mode != Maxwell::WindowOrigin::Mode::UpperLeft ? 1 : 0);
-    viewport_scale_offset_enabled.Assign(regs.viewport_scale_offset_enabled != 0);
 
     bool use_last_provoking_vertex = false;
     const bool provoking_vertex_available = features.has_provoking_vertex;

src/video_core/renderer_vulkan/fixed_pipeline_state.h

@@ -231,7 +231,6 @@ struct FixedPipelineState {
         BitField<15, 1, u32> alpha_to_coverage_enabled;
         BitField<16, 1, u32> alpha_to_one_enabled;
         BitField<17, 3, Tegra::Engines::Maxwell3D::EngineHint> app_stage;
-        BitField<20, 1, u32> viewport_scale_offset_enabled;
     };
     std::array<u8, Maxwell::NumRenderTargets> color_formats;