[TEST] Adjustments on pipeline hash collisions

CMakeLists.txt

@@ -339,26 +339,13 @@ 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, armv9, native")
         set(mtune generic)
-        set(armv8_2_target armv8.2-a+fp16+dotprod)
 
-        if (ANDROID)
-            set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, armv8.2, armv9, native")
-            set(march ${armv8_2_target})
-
-            if (${YUZU_BUILD_PRESET} STREQUAL "armv9")
-                set(march armv9-a)
-            endif()
-        else()
-            set(YUZU_BUILD_PRESET "custom" CACHE STRING "Build preset to use. One of: custom, generic, armv8.2, armv9, native")
-
-            if (${YUZU_BUILD_PRESET} STREQUAL "generic")
-                set(march armv8-a)
-            elseif (${YUZU_BUILD_PRESET} STREQUAL "armv8.2")
-                set(march ${armv8_2_target})
-            elseif (${YUZU_BUILD_PRESET} STREQUAL "armv9")
-                set(march armv9-a)
-            endif()
+        if (${YUZU_BUILD_PRESET} STREQUAL "generic")
+            set(march armv8-a)
+        elseif (${YUZU_BUILD_PRESET} STREQUAL "armv9")
+            set(march armv9-a)
         endif()
     endif()
 

cpmfile.json

@@ -65,12 +65,6 @@
         "repo": "eden-emulator/discord-rpc",
         "version": "0d8b2d6a37"
     },
-    "dxbc": {
-        "bundled": true,
-        "hash": "196d26c07747d7aa2ced6fb1a5ae6f665e9b917de223a540038690b037c70a1eeca51c21d42aa5bec9fff7df0a6656a75ee8b4e2cb4008469f18a6812280f831",
-        "repo": "PancakeTAS/dxbc",
-        "version": "78ab59a8aaeb43cd1b0a5e91ba86722433a10b78"
-    },
     "enet": {
         "find_args": "MODULE",
         "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",

externals/CMakeLists.txt

@@ -92,10 +92,6 @@ AddDependentPackages(vulkan-headers vulkan-utility-libraries)
 # frozen
 AddJsonPackage(frozen)
 
-# DXVK's DXBC compiler, used to translate the frame generation shaders
-# out of a user-supplied Lossless.dll into SPIR-V
-AddJsonPackage(dxbc)
-
 # DiscordRPC
 if (USE_DISCORD_PRESENCE)
     if (ARCHITECTURE_arm64)

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/features/settings/model/BooleanSetting.kt

@@ -37,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,6 +586,7 @@ abstract class SettingsItem(
                     IntSetting.FSR_SHARPENING_SLIDER,
                     titleId = R.string.fsr_sharpness,
                     descriptionId = R.string.fsr_sharpness_description,
+                    max = 200,
                     units = "%"
                 )
             )
@@ -645,71 +608,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,

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 = 100,
+                    maxValue = 200,
                     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

@@ -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

@@ -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,8 +33,8 @@ void AndroidConfig::SaveAllValues() {
 }
 
 void AndroidConfig::ReadAndroidValues() {
-    ReadAndroidUIValues();
     if (global) {
+        ReadAndroidUIValues();
         ReadUIValues();
         BeginGroup(Settings::TranslateCategory(Settings::Category::DataStorage));
         Settings::values.ext_content_from_game_dirs = ReadBooleanSetting(
@@ -223,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"
@@ -1092,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) {
@@ -1195,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) {
@@ -1428,23 +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) {
-    const auto path = VideoCore::FrameGen::GetLosslessDllPath();
-    return Common::Android::ToJString(env, Common::FS::PathToUTF8String(path));
-}
-
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_validateLosslessDll(JNIEnv* env, jclass clazz) {
-    return static_cast<jint>(VideoCore::FrameGen::GetInstalledLosslessStatus());
-}
-
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_prepareLosslessDll(JNIEnv* env, jclass clazz) {
-    return static_cast<jint>(VideoCore::FrameGen::BuildShaderCache());
-}
-
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_removeLosslessDll(JNIEnv* env, jclass clazz) {
-    return static_cast<jboolean>(VideoCore::FrameGen::RemoveInstalledLosslessDll());
-}
-
 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/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>
@@ -680,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>

src/common/fs/fs_paths.h

@@ -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

@@ -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/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/video_core/CMakeLists.txt

@@ -59,10 +59,6 @@ add_library(video_core STATIC
     engines/maxwell_dma.h
     engines/puller.cpp
     engines/puller.h
-    frame_gen/lossless_dll.cpp
-    frame_gen/lossless_dll.h
-    frame_gen/lsfg_translate.cpp
-    frame_gen/lsfg_translate.h
     framebuffer_config.cpp
     framebuffer_config.h
     fsr.cpp
@@ -125,28 +121,6 @@ add_library(video_core STATIC
     renderer_vulkan/present/anti_alias_pass.h
     renderer_vulkan/present/filters.cpp
     renderer_vulkan/present/filters.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
     renderer_vulkan/present/fsr.cpp
     renderer_vulkan/present/fsr.h
     renderer_vulkan/present/fxaa.cpp
@@ -371,7 +345,6 @@ add_dependencies(video_core host_shaders)
 target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
 
 target_link_libraries(video_core PRIVATE sirit::sirit)
-target_link_libraries(video_core PRIVATE dxbc)
 
 # Header-only stuff needed by all dependent targets
 target_link_libraries(video_core PUBLIC Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)

src/video_core/buffer_cache/buffer_cache.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <algorithm>
+#include <bit>
 #include <memory>
 #include <numeric>
 
@@ -809,46 +810,46 @@ void BufferCache<P>::BindHostVertexBuffers() {
 
     if (use_optimized_vertex_buffers) {
         auto& flags = maxwell3d->dirty.flags;
-        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 u32 enabled_mask = enabled_vertex_buffers_mask;
+        bool any_dirty = false;
+        u32 pending_mask = enabled_mask;
+        while (pending_mask != 0) {
+            const u32 index = std::countr_zero(pending_mask);
+            pending_mask &= (pending_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]) {
-                flush_bindings();
-                continue;
-            }
+            any_dirty |= flags[Dirty::VertexBuffer0 + index];
+        }
+        if (enabled_mask == 0 || !any_dirty) {
+            return;
+        }
+        const u32 min_index = static_cast<u32>(std::countr_zero(enabled_mask));
+        const u32 max_index = 32u - static_cast<u32>(std::countl_zero(enabled_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);
+                continue;
+            }
+            const Binding& binding = VertexBufferSlot(index);
+            Buffer& buffer = slot_buffers[binding.buffer_id];
             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;
         }
-        flush_bindings();
+        runtime.BindVertexBuffers(bindings);
     } else {
         HostBindings<typename P::Buffer> host_bindings;
         bool any_valid{false};

src/video_core/frame_gen/lossless_dll.cpp

@@ -1,575 +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) {
-    switch (variant) {
-    case ShaderVariant::NativeFp16:
-        return PerformanceShader::NATIVE_FP16_OFFSET;
-    case ShaderVariant::NativeFp32:
-        return PerformanceShader::NATIVE_FP32_OFFSET;
-    default:
-        return 0;
-    }
-}
-
-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]] ShaderVariant SelectVariant(const ResourceSpans& resources, bool prefer_fp16) {
-    if (prefer_fp16 && HasNativeVariant(resources, ShaderVariant::NativeFp16)) {
-        return ShaderVariant::NativeFp16;
-    }
-    if (HasNativeVariant(resources, ShaderVariant::NativeFp32)) {
-        return ShaderVariant::NativeFp32;
-    }
-    return ShaderVariant::TranslatedDxbc;
-}
-
-[[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;
-        }
-        if (variant != ShaderVariant::TranslatedDxbc) {
-            std::vector<u32> adopted = AdoptSpirvModule(hit->second);
-            if (adopted.empty()) {
-                return LosslessStatus::TranslationFailed;
-            }
-            out_modules.emplace(id, std::move(adopted));
-            continue;
-        }
-
-        std::vector<u32> words = TranslateComputeShader(hit->second);
-        if (words.empty()) {
-            return LosslessStatus::TranslationFailed;
-        }
-        out_modules.emplace(id, std::move(words));
-    }
-    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());
-}
-
-ShaderVariant GetAvailableVariant(bool prefer_fp16) {
-    std::vector<u8> image;
-    if (ReadImageFile(GetLosslessDllPath(), image) != LosslessStatus::Ok) {
-        return ShaderVariant::TranslatedDxbc;
-    }
-
-    ResourceSpans spans;
-    if (ParseShaderSpans(image, spans) != LosslessStatus::Ok) {
-        return ShaderVariant::TranslatedDxbc;
-    }
-
-    return SelectVariant(spans, prefer_fp16);
-}
-
-LosslessStatus LoadShaderModules(ShaderModules& out_modules, 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 ShaderVariant variant = SelectVariant(spans, prefer_fp16);
-
-    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);
-}
-
-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,69 +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 {
-    TranslatedDxbc,
-    NativeFp32,
-    NativeFp16,
-};
-
-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]] ShaderVariant GetAvailableVariant(bool prefer_fp16);
-
-[[nodiscard]] LosslessStatus LoadShaderModules(ShaderModules& out_modules,
-                                              bool prefer_fp16 = false);
-
-bool RemoveInstalledLosslessDll();
-
-} // namespace VideoCore::FrameGen

src/video_core/frame_gen/lsfg_translate.cpp

@@ -1,129 +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 <dxbc_modinfo.h>
-#include <dxbc_module.h>
-#include <dxbc_reader.h>
-#include <thirdparty/spirv.hpp>
-
-#include "video_core/frame_gen/lsfg_translate.h"
-
-namespace VideoCore::FrameGen {
-
-namespace {
-
-constexpr u32 DECORATION_LITERAL_WORD = 3;
-constexpr size_t SPIRV_HEADER_WORDS = 5;
-
-void RenumberBindings(dxvk::SpirvCodeBuffer& code) {
-    std::vector<u32> literal_offsets;
-    for (const auto instruction : code) {
-        if (instruction.opCode() == spv::OpFunction) {
-            break;
-        }
-        if (instruction.opCode() == spv::OpDecorate &&
-            instruction.arg(2) == spv::DecorationBinding) {
-            literal_offsets.push_back(instruction.offset() + DECORATION_LITERAL_WORD);
-        }
-    }
-
-    for (size_t i = 0; i < literal_offsets.size(); ++i) {
-        code.data()[literal_offsets[i]] = static_cast<u32>(i);
-    }
-}
-
-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] >> spv::WordCountShift;
-        const u32 opcode = words[offset] & spv::OpCodeMask;
-        if (length == 0 || offset + length > words.size()) {
-            return;
-        }
-        if (opcode == spv::OpFunction) {
-            break;
-        }
-        if (opcode == spv::OpDecorate && length >= 4) {
-            if (words[offset + 2] == spv::DecorationDescriptorSet) {
-                sets[words[offset + 1]] = words[offset + 3];
-            } else if (words[offset + 2] == spv::DecorationBinding) {
-                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 == spv::MagicNumber;
-}
-
-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;
-}
-
-std::vector<u32> TranslateComputeShader(std::span<const u8> dxbc) {
-    if (dxbc.empty()) {
-        return {};
-    }
-
-    try {
-        dxvk::DxbcReader reader{reinterpret_cast<const char*>(dxbc.data()), dxbc.size()};
-        dxvk::DxbcModule module{reader};
-
-        const dxvk::DxbcModuleInfo module_info{};
-        dxvk::SpirvCodeBuffer code = module.compile(module_info, "CS");
-        if (code.dwords() == 0) {
-            return {};
-        }
-
-        RenumberBindings(code);
-        return std::vector<u32>{code.data(), code.data() + code.dwords()};
-    } catch (...) {
-        return {};
-    }
-}
-
-} // namespace VideoCore::FrameGen

src/video_core/frame_gen/lsfg_translate.h

@@ -1,19 +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);
-
-[[nodiscard]] std::vector<u32> TranslateComputeShader(std::span<const u8> dxbc);
-
-} // namespace VideoCore::FrameGen

src/video_core/host_shaders/CMakeLists.txt

@@ -17,11 +17,13 @@ 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_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

src/video_core/host_shaders/block_linear_unswizzle_2d_buffer.comp

@@ -0,0 +1,104 @@
+// 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

@@ -0,0 +1,105 @@
+// 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/sgsr1_shader.vert

@@ -7,6 +7,7 @@ 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;
@@ -15,5 +16,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 = vec2(x, y) * abs(resize_factor) * 0.5;
+    texcoord = crop_offset + vec2(x, y) * abs(resize_factor) * 0.5;
 }

src/video_core/host_shaders/sgsr1_shader_mobile.frag

@@ -14,6 +14,7 @@ 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,6 +13,7 @@
 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_vulkan/blit_image.cpp

@@ -1191,7 +1191,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceColorPipeline(const BlitImagePipelineKe
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *blit_color_pipelines.back();
 }
 
@@ -1223,7 +1223,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceDepthStencilPipeline(const BlitImagePip
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *blit_depth_stencil_pipelines.back();
 }
 
@@ -1276,7 +1276,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearColorPipeline(const BlitImagePipel
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *clear_color_pipelines.back();
 }
 
@@ -1332,7 +1332,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearStencilPipeline(
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *clear_stencil_pipelines.back();
 }
 
@@ -1375,7 +1375,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceBlitColorMSAAPipeline(const BlitMSAAPip
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *blit_msaa_color_pipelines.back();
 }
 
@@ -1413,7 +1413,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceResolveDepthStencilPipeline(VkRenderPas
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *pipelines.back();
 }
 
@@ -1458,7 +1458,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceMSAACopyPipeline(const MSAACopyPipeline
         .subpass = 0,
         .basePipelineHandle = VK_NULL_HANDLE,
         .basePipelineIndex = 0,
-    }));
+    }, device.StaticPipelineCache()));
     return *msaa_copy_pipelines.back();
 }
 
@@ -1499,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,
@@ -1542,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/present/frame_gen.cpp

@@ -1,361 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "common/fs/file.h"
-#include "common/fs/fs.h"
-#include "common/fs/path_util.h"
-#include "common/settings.h"
-#include "video_core/renderer_vulkan/present/frame_gen.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/renderer_vulkan/vk_present_manager.h"
-#include "video_core/renderer_vulkan/vk_scheduler.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr size_t COLOR_CHANNELS = 4;
-constexpr u64 LSFG_REQUIRED_FRAMES = 2;
-constexpr u32 LSFG_RECURRENCE_FRAMES = 2;
-
-[[nodiscard]] f32 ManualFlowScale() {
-    return static_cast<f32>(Settings::values.frame_gen_flow_scale.GetValue()) / 100.0f;
-}
-
-[[nodiscard]] f32 ConfiguredFlowScale(VkExtent2D guest_extent, VkExtent2D presented_extent) {
-    if (!Settings::values.frame_gen_flow_scale_auto.GetValue()) {
-        return ManualFlowScale();
-    }
-    if (guest_extent.width == 0 || presented_extent.width == 0) {
-        return 1.0f;
-    }
-
-    const f32 rendered_width = static_cast<f32>(guest_extent.width) *
-                               Settings::values.resolution_info.up_factor;
-    const f32 ratio = rendered_width / static_cast<f32>(presented_extent.width);
-
-    constexpr f32 FLOW_SCALE_STEPS = 20.0f;
-    const f32 stepped = std::ceil(ratio * FLOW_SCALE_STEPS) / FLOW_SCALE_STEPS;
-    return std::clamp(stepped, 0.25f, 1.0f);
-}
-
-bool IsBlueFirst(VkFormat format) {
-    return format == VK_FORMAT_B8G8R8A8_UNORM || format == VK_FORMAT_B8G8R8A8_SRGB;
-}
-
-VkDeviceSize BytesPerTexel(VkFormat format) {
-    switch (format) {
-    case VK_FORMAT_R8_UNORM:
-        return 1;
-    case VK_FORMAT_R16G16B16A16_SFLOAT:
-        return 8;
-    default:
-        return COLOR_CHANNELS;
-    }
-}
-
-void WritePortablePixmap(const std::filesystem::path& path, const std::string& magic,
-                         VkExtent2D extent, std::span<const u8> pixels) {
-    Common::FS::IOFile file{path, Common::FS::FileAccessMode::Write,
-                            Common::FS::FileType::BinaryFile};
-    if (!file.IsOpen()) {
-        return;
-    }
-
-    const std::string header = magic + "\n" + std::to_string(extent.width) + " " +
-                               std::to_string(extent.height) + "\n255\n";
-    if (file.Write(header) != header.size()) {
-        return;
-    }
-
-    void(file.Write(pixels));
-    void(file.Flush());
-}
-
-void WriteGrayscalePgm(const std::filesystem::path& path, VkExtent2D extent,
-                       std::span<const u8> pixels) {
-    const size_t expected = static_cast<size_t>(extent.width) * extent.height;
-    WritePortablePixmap(path, "P5", extent, pixels.subspan(0, std::min(expected, pixels.size())));
-}
-
-void WriteRaw(const std::filesystem::path& path, std::span<const u8> pixels) {
-    Common::FS::IOFile file{path, Common::FS::FileAccessMode::Write,
-                            Common::FS::FileType::BinaryFile};
-    if (!file.IsOpen()) {
-        return;
-    }
-    void(file.Write(pixels));
-    void(file.Flush());
-}
-
-void WriteColorPpm(const std::filesystem::path& path, VkExtent2D extent,
-                   std::span<const u8> pixels, bool blue_first) {
-    const size_t pixel_count = static_cast<size_t>(extent.width) * extent.height;
-    if (pixels.size() < pixel_count * COLOR_CHANNELS) {
-        return;
-    }
-
-    std::vector<u8> rgb(pixel_count * 3);
-    for (size_t i = 0; i < pixel_count; ++i) {
-        const u8 first = pixels[i * COLOR_CHANNELS];
-        const u8 green = pixels[i * COLOR_CHANNELS + 1];
-        const u8 third = pixels[i * COLOR_CHANNELS + 2];
-        rgb[i * 3] = blue_first ? third : first;
-        rgb[i * 3 + 1] = green;
-        rgb[i * 3 + 2] = blue_first ? first : third;
-    }
-
-    WritePortablePixmap(path, "P6", extent, rgb);
-}
-
-VkImageMemoryBarrier MakeTransitionBarrier(VkImage image, VkAccessFlags src_access,
-                                           VkAccessFlags dst_access, VkImageLayout old_layout,
-                                           VkImageLayout new_layout) {
-    return VkImageMemoryBarrier{
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = nullptr,
-        .srcAccessMask = src_access,
-        .dstAccessMask = dst_access,
-        .oldLayout = old_layout,
-        .newLayout = new_layout,
-        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .image = image,
-        .subresourceRange{
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-            .baseMipLevel = 0,
-            .levelCount = 1,
-            .baseArrayLayer = 0,
-            .layerCount = 1,
-        },
-    };
-}
-
-VkImageCopy MakeCopyRegion(VkExtent2D extent) {
-    return VkImageCopy{
-        .srcSubresource{
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-            .mipLevel = 0,
-            .baseArrayLayer = 0,
-            .layerCount = 1,
-        },
-        .srcOffset = {},
-        .dstSubresource{
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-            .mipLevel = 0,
-            .baseArrayLayer = 0,
-            .layerCount = 1,
-        },
-        .dstOffset = {},
-        .extent = {.width = extent.width, .height = extent.height, .depth = 1},
-    };
-}
-
-void CopyPresentedFrame(vk::CommandBuffer cmdbuf, VkImage source, LsfgImage& destination,
-                        VkExtent2D extent) {
-    const auto make_barrier = MakeTransitionBarrier;
-
-    const std::array before{
-        make_barrier(source, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
-                     VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL),
-        make_barrier(destination.Handle(), VK_ACCESS_SHADER_READ_BIT, VK_ACCESS_TRANSFER_WRITE_BIT,
-                     destination.Layout(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL),
-    };
-    cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                               VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-                           VK_PIPELINE_STAGE_TRANSFER_BIT, 0, {}, {}, before);
-
-    cmdbuf.CopyImage(source, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, destination.Handle(),
-                     VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, MakeCopyRegion(extent));
-
-    const std::array after{
-        make_barrier(source, VK_ACCESS_TRANSFER_READ_BIT, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
-                     VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL),
-        make_barrier(destination.Handle(), VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT,
-                     VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL),
-    };
-    cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,
-                           VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                               VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-                           0, {}, {}, after);
-
-    destination.SetLayout(VK_IMAGE_LAYOUT_GENERAL);
-}
-
-} // Anonymous namespace
-
-FrameGen::FrameGen(MemoryAllocator& memory_allocator_, Scheduler& scheduler_)
-    : memory_allocator{memory_allocator_}, scheduler{scheduler_} {}
-
-FrameGen::~FrameGen() = default;
-
-void FrameGen::Process(const Device& device, Frame* frame, VkFormat format,
-                       VkExtent2D guest_extent) {
-    generated = false;
-
-    if (unavailable || !Settings::values.frame_gen.GetValue()) {
-        if (chain) {
-            scheduler.Finish();
-            chain.reset();
-        }
-        warm_streak = 0;
-        return;
-    }
-
-    if (!frame->storage_view) {
-        unavailable = true;
-        return;
-    }
-
-    if (!shaders) {
-        shaders.emplace(device);
-        if (!shaders->IsValid()) {
-            unavailable = true;
-            return;
-        }
-    }
-
-    peak_guest_extent.width = std::max(peak_guest_extent.width, guest_extent.width);
-    peak_guest_extent.height = std::max(peak_guest_extent.height, guest_extent.height);
-
-    const VkExtent2D extent{.width = frame->width, .height = frame->height};
-    const f32 flow_scale = ConfiguredFlowScale(peak_guest_extent, extent);
-    if (!chain || built_extent.width != extent.width || built_extent.height != extent.height ||
-        built_format != format || built_flow_scale != flow_scale) {
-        Rebuild(device, extent, format, flow_scale);
-    }
-
-    const u64 count = frame_count++;
-    last_count = count;
-    last_generations = plan.generations;
-
-    const bool warm = plan.warm && count + 1 >= LSFG_REQUIRED_FRAMES;
-    warm_streak = warm ? warm_streak + 1 : 0;
-    generated = warm && warm_streak >= LSFG_RECURRENCE_FRAMES && plan.generations > 0;
-
-    scheduler.RequestOutsideRenderPassOperationContext();
-    scheduler.Record([this, source = *frame->image, extent, count,
-                      dispatch = warm](vk::CommandBuffer cmdbuf) {
-        CopyPresentedFrame(cmdbuf, source, chain->Input(count), extent);
-        if (dispatch) {
-            chain->DispatchShared(cmdbuf, count);
-        }
-    });
-
-    const bool dump_requested = generated && Settings::values.frame_gen_dump_flow.GetValue();
-    if (!dump_requested) {
-        dumped = false;
-    } else if (!dumped) {
-        DumpDebugImages(count);
-        dumped = true;
-    }
-}
-
-size_t FrameGen::WantedGenerations(size_t capacity) {
-    if (unavailable) {
-        plan = {};
-        return 0;
-    }
-    plan = pacer.Plan(capacity);
-    return plan.generations;
-}
-
-size_t FrameGen::GeneratedFrameCount() const {
-    return generated ? last_generations : 0;
-}
-
-void FrameGen::GenerateInto(const Device& device, Frame* destination, size_t generation) {
-    chain->SetTarget(device, last_generations, generation, destination->index,
-                     *destination->storage_view);
-
-    const VkExtent2D extent{.width = destination->width, .height = destination->height};
-
-    scheduler.RequestOutsideRenderPassOperationContext();
-    scheduler.Record([this, count = last_count, generation_count = last_generations, generation,
-                      target = destination->index, image = *destination->image,
-                      extent](vk::CommandBuffer cmdbuf) {
-        chain->DispatchGeneration(cmdbuf, count, generation_count, generation, target, image,
-                                  extent);
-    });
-}
-
-void FrameGen::Rebuild(const Device& device, VkExtent2D extent, VkFormat format, f32 flow_scale) {
-    scheduler.Finish();
-    chain.reset();
-
-    built_flow_scale = flow_scale;
-
-    chain.emplace(device, memory_allocator, *shaders, extent, format, built_flow_scale);
-    built_extent = extent;
-    built_format = format;
-    frame_count = 0;
-    warm_streak = 0;
-    generated = false;
-}
-
-void FrameGen::DumpDebugImages(u64 count) {
-    const std::filesystem::path directory =
-        Common::FS::GetEdenPath(Common::FS::EdenPath::LosslessDir) / "debug";
-    if (!Common::FS::CreateDirs(directory)) {
-        return;
-    }
-
-    const auto dump = [&](const std::string& name, LsfgImage& image) {
-        const VkExtent2D extent = image.Extent();
-        const VkFormat format = image.Format();
-        const VkDeviceSize texel_size = BytesPerTexel(format);
-        const VkDeviceSize size =
-            static_cast<VkDeviceSize>(extent.width) * extent.height * texel_size;
-
-        vk::Buffer buffer = CreateWrappedBuffer(memory_allocator, size, MemoryUsage::Download);
-
-        scheduler.RequestOutsideRenderPassOperationContext();
-        scheduler.Record(
-            [handle = image.Handle(), dst = *buffer, extent](vk::CommandBuffer cmdbuf) {
-                DownloadColorImage(
-                    cmdbuf, handle, dst,
-                    VkExtent3D{.width = extent.width, .height = extent.height, .depth = 1});
-            });
-        scheduler.Finish();
-
-        buffer.Invalidate();
-        const std::span<u8> mapped = buffer.Mapped();
-
-        if (format == LSFG_FLOW_FORMAT) {
-            WriteGrayscalePgm(directory / (name + ".pgm"), extent, mapped);
-        } else if (texel_size == COLOR_CHANNELS) {
-            WriteColorPpm(directory / (name + ".ppm"), extent, mapped, IsBlueFirst(format));
-        } else {
-            WriteRaw(directory / (name + "_" + std::to_string(extent.width) + "x" +
-                                  std::to_string(extent.height) + ".f16"),
-                     mapped.subspan(0, std::min<size_t>(size, mapped.size())));
-        }
-    };
-
-    dump("in0", chain->Input(0));
-    dump("in1", chain->Input(1));
-
-    for (size_t level = 0; level < LSFG_MIP_LEVELS; ++level) {
-        dump("flow_mip" + std::to_string(level), chain->FlowLevel(level));
-    }
-    for (size_t index = 0; index < 2; ++index) {
-        dump("alpha0_" + std::to_string(index), chain->AlphaOutput(0, count, index));
-        dump("alpha6_" + std::to_string(index), chain->AlphaOutput(LSFG_MIP_LEVELS - 1, count,
-                                                                  index));
-    }
-    for (size_t level = 0; level < LSFG_BETA_OUTPUTS; ++level) {
-        dump("beta_" + std::to_string(level), chain->BetaOutput(level));
-    }
-
-    dump("gamma0", chain->GammaOutput(0));
-    dump("gamma6", chain->GammaOutput(LSFG_MIP_LEVELS - 1));
-    dump("delta2_out1", chain->DeltaOutput1(LSFG_DELTA_INSTANCES - 1));
-    dump("delta2_out2", chain->DeltaOutput2(LSFG_DELTA_INSTANCES - 1));
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/frame_gen.h

@@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <optional>
-
-#include "common/common_types.h"
-#include "video_core/renderer_vulkan/present/frame_gen_pacer.h"
-#include "video_core/renderer_vulkan/present/lsfg_chain.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/vulkan_common/vulkan_memory_allocator.h"
-
-namespace Vulkan {
-
-class Device;
-class Scheduler;
-struct Frame;
-
-class FrameGen {
-public:
-    explicit FrameGen(MemoryAllocator& memory_allocator, Scheduler& scheduler);
-    ~FrameGen();
-
-    void Process(const Device& device, Frame* frame, VkFormat format, VkExtent2D guest_extent);
-
-    [[nodiscard]] size_t WantedGenerations(size_t capacity);
-
-    [[nodiscard]] size_t GeneratedFrameCount() const;
-
-    void GenerateInto(const Device& device, Frame* destination, size_t generation);
-
-private:
-    void Rebuild(const Device& device, VkExtent2D extent, VkFormat format, f32 flow_scale);
-    void DumpDebugImages(u64 count);
-
-    MemoryAllocator& memory_allocator;
-    Scheduler& scheduler;
-
-    std::optional<LsfgShaders> shaders;
-    std::optional<LsfgChain> chain;
-    FrameGenPacer pacer;
-    FrameGenPlan plan{};
-    VkExtent2D peak_guest_extent{};
-    VkExtent2D built_extent{};
-    VkFormat built_format{VK_FORMAT_UNDEFINED};
-    f32 built_flow_scale{};
-    u64 frame_count{};
-    u64 last_count{};
-    size_t last_generations{};
-    u32 warm_streak{};
-    bool generated{};
-    bool unavailable{};
-    bool dumped{};
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/frame_gen_pacer.cpp

@@ -1,240 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <algorithm>
-#include <cmath>
-#include <utility>
-
-#include "common/settings.h"
-#include "video_core/renderer_vulkan/present/frame_gen_pacer.h"
-
-namespace Vulkan {
-
-namespace {
-
-using Clock = std::chrono::steady_clock;
-
-constexpr f32 INTERVAL_SMOOTHING = 0.25f;
-constexpr f32 MINIMUM_BASE_RATE = 10.0f;
-constexpr f32 BURST_CADENCE_RATIO = 3.0f;
-constexpr f32 BURST_TARGET_RATIO = 2.0f;
-constexpr f32 PROBE_THROUGHPUT_TOLERANCE = 0.95f;
-constexpr f32 PROBE_BASE_COLLAPSE_RATIO = 0.70f;
-constexpr f32 PROBE_MARGINAL_GAIN = 1.15f;
-constexpr f32 TARGET_SATISFIED_RATIO = 0.95f;
-constexpr f32 UNLOADED_BASE_RETENTION = 0.75f;
-constexpr f32 CREDIT_EPSILON = 1.0e-4f;
-constexpr u32 MAX_PROBE_FAILURES = 4;
-
-constexpr auto STABILIZATION_DURATION = std::chrono::seconds(1);
-constexpr auto PROBE_DURATION = std::chrono::seconds(1);
-constexpr auto DEFICIT_DURATION = std::chrono::seconds(1);
-constexpr auto PROBE_STEP_DELAY = std::chrono::milliseconds(250);
-
-[[nodiscard]] Clock::duration ProbeBackoff(u32 failures) {
-    switch (failures) {
-    case 1:
-        return std::chrono::seconds(5);
-    case 2:
-        return std::chrono::seconds(15);
-    case 3:
-        return std::chrono::seconds(30);
-    default:
-        return std::chrono::seconds(60);
-    }
-}
-
-} // Anonymous namespace
-
-FrameGenPlan FrameGenPacer::Plan(size_t capacity) {
-    const size_t ceiling = std::min(capacity, Settings::FrameGenMaxGenerations());
-    if (ceiling == 0) {
-        Reset();
-        return {};
-    }
-
-    const Clock::time_point now = Clock::now();
-    const size_t previous_generations = std::exchange(issued_generations, 0);
-    if (!last_frame) {
-        last_frame = now;
-        return {};
-    }
-
-    const Clock::duration interval = now - *last_frame;
-    const f32 interval_seconds = std::chrono::duration<f32>(interval).count();
-    last_frame = now;
-
-    if (interval_seconds <= 0.0f) {
-        Stabilize(now);
-        return {};
-    }
-
-    const f32 target_rate = static_cast<f32>(Settings::values.frame_gen_target_rate.GetValue());
-
-    if (smoothed_interval > 0.0f) {
-        f32 burst_threshold = BURST_CADENCE_RATIO / smoothed_interval;
-        if (target_rate > 0.0f) {
-            burst_threshold = std::max(burst_threshold, target_rate * BURST_TARGET_RATIO);
-        }
-        if (1.0f / interval_seconds > burst_threshold) {
-            DeferEvaluations(interval);
-            output_credit = 0.0f;
-            return {};
-        }
-    }
-
-    if (interval_seconds > 1.0f / MINIMUM_BASE_RATE) {
-        Stabilize(now);
-        return {};
-    }
-
-    smoothed_interval = smoothed_interval > 0.0f
-                            ? smoothed_interval +
-                                  (interval_seconds - smoothed_interval) * INTERVAL_SMOOTHING
-                            : interval_seconds;
-
-    if (previous_generations == 0) {
-        const f32 measured = 1.0f / smoothed_interval;
-        unloaded_base_rate =
-            unloaded_base_rate > 0.0f
-                ? unloaded_base_rate + (measured - unloaded_base_rate) * INTERVAL_SMOOTHING
-                : measured;
-    }
-
-    if (stable_until) {
-        if (now < *stable_until) {
-            return {};
-        }
-        stable_until.reset();
-    }
-
-    if (target_rate == 0.0f) {
-        limit = std::min(Settings::FrameGenGenerations(), ceiling);
-        output_credit = 0.0f;
-        issued_generations = limit;
-        return {.generations = limit, .warm = limit > 0};
-    }
-
-    UpdateLimit(now, 1.0f / smoothed_interval, target_rate, ceiling);
-
-    const size_t allowed = std::min(limit, ceiling);
-    const f32 desired_outputs = smoothed_interval * target_rate;
-    if (allowed == 0 || desired_outputs <= 1.0f) {
-        output_credit = 0.0f;
-        return {};
-    }
-
-    output_credit += desired_outputs;
-    const size_t outputs =
-        std::max<size_t>(1, static_cast<size_t>(std::floor(output_credit + CREDIT_EPSILON)));
-    const size_t generations = std::min(outputs - 1, allowed);
-
-    output_credit -= static_cast<f32>(generations + 1);
-    if (output_credit < 0.0f) {
-        output_credit = 0.0f;
-    } else if (generations == allowed && output_credit >= 1.0f) {
-        output_credit = std::fmod(output_credit, 1.0f);
-    }
-
-    issued_generations = generations;
-    return {.generations = generations, .warm = true};
-}
-
-void FrameGenPacer::UpdateLimit(Clock::time_point now, f32 base_rate, f32 target_rate,
-                                size_t ceiling) {
-    limit = std::min(limit, ceiling);
-
-    if (probe_until) {
-        if (now < *probe_until) {
-            return;
-        }
-        probe_until.reset();
-        output_credit = 0.0f;
-
-        const f32 previous_output =
-            std::min(target_rate, probe_base_rate * static_cast<f32>(probe_previous_limit + 1));
-        const f32 current_output =
-            std::min(target_rate, base_rate * static_cast<f32>(limit + 1));
-
-        const bool throughput_regressed =
-            current_output < previous_output * PROBE_THROUGHPUT_TOLERANCE;
-        const bool collapsed_for_marginal_gain =
-            base_rate < probe_base_rate * PROBE_BASE_COLLAPSE_RATIO &&
-            current_output < previous_output * PROBE_MARGINAL_GAIN;
-        const bool emulation_slowed = unloaded_base_rate > 0.0f &&
-                                      base_rate < unloaded_base_rate * UNLOADED_BASE_RETENTION;
-
-        if (throughput_regressed || collapsed_for_marginal_gain || emulation_slowed) {
-            limit = probe_previous_limit;
-            probe_failures = std::min(probe_failures + 1, MAX_PROBE_FAILURES);
-            next_probe = now + ProbeBackoff(probe_failures);
-            deficit_since.reset();
-            return;
-        }
-
-        probe_failures = 0;
-        next_probe = now + PROBE_STEP_DELAY;
-    }
-
-    if (base_rate * static_cast<f32>(limit + 1) >= target_rate * TARGET_SATISFIED_RATIO ||
-        limit >= ceiling) {
-        deficit_since.reset();
-        return;
-    }
-
-    if (!deficit_since) {
-        deficit_since = now;
-        return;
-    }
-    if (now - *deficit_since < DEFICIT_DURATION) {
-        return;
-    }
-    if (next_probe && now < *next_probe) {
-        return;
-    }
-
-    probe_previous_limit = limit;
-    probe_base_rate = base_rate;
-    ++limit;
-    probe_until = now + PROBE_DURATION;
-    deficit_since.reset();
-    output_credit = 0.0f;
-}
-
-void FrameGenPacer::DeferEvaluations(Clock::duration amount) {
-    const auto defer = [amount](std::optional<Clock::time_point>& deadline) {
-        if (deadline) {
-            *deadline += amount;
-        }
-    };
-    defer(stable_until);
-    defer(probe_until);
-    defer(next_probe);
-    deficit_since.reset();
-}
-
-void FrameGenPacer::Stabilize(Clock::time_point now) {
-    stable_until = now + STABILIZATION_DURATION;
-    probe_until.reset();
-    deficit_since.reset();
-    smoothed_interval = 0.0f;
-    output_credit = 0.0f;
-}
-
-void FrameGenPacer::Reset() {
-    last_frame.reset();
-    stable_until.reset();
-    probe_until.reset();
-    next_probe.reset();
-    deficit_since.reset();
-    smoothed_interval = 0.0f;
-    output_credit = 0.0f;
-    probe_base_rate = 0.0f;
-    unloaded_base_rate = 0.0f;
-    issued_generations = 0;
-    probe_previous_limit = 0;
-    limit = 0;
-    probe_failures = 0;
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/frame_gen_pacer.h

@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <chrono>
-#include <optional>
-
-#include "common/common_types.h"
-
-namespace Vulkan {
-
-struct FrameGenPlan {
-    size_t generations{};
-    bool warm{};
-};
-
-class FrameGenPacer {
-public:
-    [[nodiscard]] FrameGenPlan Plan(size_t capacity);
-
-    void Reset();
-
-private:
-    using Clock = std::chrono::steady_clock;
-
-    void Stabilize(Clock::time_point now);
-    void DeferEvaluations(Clock::duration amount);
-    void UpdateLimit(Clock::time_point now, f32 base_rate, f32 target_rate, size_t ceiling);
-
-    std::optional<Clock::time_point> last_frame;
-    std::optional<Clock::time_point> stable_until;
-    std::optional<Clock::time_point> probe_until;
-    std::optional<Clock::time_point> next_probe;
-    std::optional<Clock::time_point> deficit_since;
-    f32 smoothed_interval{};
-    f32 output_credit{};
-    f32 probe_base_rate{};
-    f32 unloaded_base_rate{};
-    size_t issued_generations{};
-    size_t probe_previous_limit{};
-    size_t limit{};
-    u32 probe_failures{};
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_alpha.cpp

@@ -1,140 +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
-
-#include <vector>
-
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_alpha.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DISPATCH_TILE_SHIFT = 3;
-
-[[nodiscard]] u32 GroupCount(u32 size) {
-    return (size + (1u << DISPATCH_TILE_SHIFT) - 1) >> DISPATCH_TILE_SHIFT;
-}
-
-[[nodiscard]] VkExtent2D HalveExtent(VkExtent2D extent) {
-    return VkExtent2D{
-        .width = (extent.width + 1) >> 1,
-        .height = (extent.height + 1) >> 1,
-    };
-}
-
-} // Anonymous namespace
-
-LsfgAlphaPasses::LsfgAlphaPasses(const Device& device, const LsfgShaders& shaders) {
-    using namespace VideoCore::FrameGen::PerformanceShader;
-
-    passes[0] = LsfgPass(device, shaders, ALPHA[0],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[1] = LsfgPass(device, shaders, ALPHA[1],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[2] = LsfgPass(device, shaders, ALPHA[2],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[3] = LsfgPass(device, shaders, ALPHA[3],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-}
-
-LsfgAlpha::LsfgAlpha(const Device& device, MemoryAllocator& memory_allocator,
-                     const LsfgAlphaPasses& passes_, LsfgResources& resources,
-                     vk::DescriptorPool& descriptor_pool, LsfgImage& input_)
-    : passes{&passes_}, input{&input_} {
-    const VkExtent2D half_extent = HalveExtent(input->Extent());
-    const VkExtent2D quarter_extent = HalveExtent(half_extent);
-
-    temp1 = LsfgImage(device, memory_allocator, half_extent);
-    temp2 = LsfgImage(device, memory_allocator, half_extent);
-    for (size_t i = 0; i < temp3.size(); ++i) {
-        temp3[i] = LsfgImage(device, memory_allocator, quarter_extent);
-        for (size_t j = 0; j < LSFG_HISTORY_SLOTS; ++j) {
-            out_images[j][i] = LsfgImage(device, memory_allocator, quarter_extent);
-        }
-    }
-
-    std::vector<VkDescriptorSetLayout> layouts;
-    for (size_t i = 0; i < LSFG_ALPHA_STAGES - 1; ++i) {
-        layouts.push_back(passes->Get(i).SetLayout());
-    }
-    for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-        layouts.push_back(passes->Get(3).SetLayout());
-    }
-    owned_sets = CreateWrappedDescriptorSets(descriptor_pool, layouts);
-
-    for (size_t i = 0; i < LSFG_ALPHA_STAGES - 1; ++i) {
-        descriptor_sets[i] = owned_sets[i];
-    }
-    for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-        last_descriptor_sets[i] = owned_sets[LSFG_ALPHA_STAGES - 1 + i];
-    }
-
-    const VkSampler sampler = resources.GetSampler();
-
-    LsfgDescriptorWriter(descriptor_sets[0])
-        .AddSampler(sampler)
-        .AddSampledImage(*input)
-        .AddStorageImage(temp1)
-        .Build(device);
-    LsfgDescriptorWriter(descriptor_sets[1])
-        .AddSampler(sampler)
-        .AddSampledImage(temp1)
-        .AddStorageImage(temp2)
-        .Build(device);
-    LsfgDescriptorWriter(descriptor_sets[2])
-        .AddSampler(sampler)
-        .AddSampledImage(temp2)
-        .AddStorageImages(temp3)
-        .Build(device);
-    for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-        LsfgDescriptorWriter(last_descriptor_sets[i])
-            .AddSampler(sampler)
-            .AddSampledImages(temp3)
-            .AddStorageImages(out_images[i])
-            .Build(device);
-    }
-}
-
-void LsfgAlpha::PushBarriers(LsfgBarriers& barriers, u64 frame_count, size_t stage) {
-    switch (stage) {
-    case 0:
-        barriers.WriteToRead(*input).ReadToWrite(temp1);
-        break;
-    case 1:
-        barriers.WriteToRead(temp1).ReadToWrite(temp2);
-        break;
-    case 2:
-        barriers.WriteToRead(temp2).ReadToWriteAll(temp3);
-        break;
-    default:
-        barriers.WriteToReadAll(temp3).ReadToWriteAll(out_images[frame_count % LSFG_HISTORY_SLOTS]);
-        break;
-    }
-}
-
-void LsfgAlpha::DispatchStage(vk::CommandBuffer cmdbuf, u64 frame_count, size_t stage) {
-    const VkExtent2D extent = stage < 2 ? temp1.Extent() : temp3[0].Extent();
-    const VkDescriptorSet set = stage < LSFG_ALPHA_STAGES - 1
-                                    ? descriptor_sets[stage]
-                                    : last_descriptor_sets[frame_count % LSFG_HISTORY_SLOTS];
-
-    passes->Get(stage).BindSet(cmdbuf, set);
-    cmdbuf.Dispatch(GroupCount(extent.width), GroupCount(extent.height), 1);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_alpha.h

@@ -1,62 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr size_t LSFG_ALPHA_STAGES = 4;
-
-class LsfgAlphaPasses {
-public:
-    LsfgAlphaPasses() = default;
-    LsfgAlphaPasses(const Device& device, const LsfgShaders& shaders);
-
-    [[nodiscard]] const LsfgPass& Get(size_t stage) const {
-        return passes[stage];
-    }
-
-private:
-    std::array<LsfgPass, LSFG_ALPHA_STAGES> passes;
-};
-
-class LsfgAlpha {
-public:
-    LsfgAlpha() = default;
-    LsfgAlpha(const Device& device, MemoryAllocator& memory_allocator,
-              const LsfgAlphaPasses& passes_, LsfgResources& resources,
-              vk::DescriptorPool& descriptor_pool, LsfgImage& input);
-
-    void PushBarriers(LsfgBarriers& barriers, u64 frame_count, size_t stage);
-    void DispatchStage(vk::CommandBuffer cmdbuf, u64 frame_count, size_t stage);
-
-    [[nodiscard]] LsfgImageHistory& Outputs() {
-        return out_images;
-    }
-
-private:
-    const LsfgAlphaPasses* passes{};
-    LsfgImage* input{};
-
-    std::array<VkDescriptorSet, LSFG_ALPHA_STAGES - 1> descriptor_sets{};
-    std::array<VkDescriptorSet, LSFG_HISTORY_SLOTS> last_descriptor_sets{};
-    vk::DescriptorSets owned_sets;
-
-    LsfgImage temp1;
-    LsfgImage temp2;
-    LsfgImagePair temp3;
-    LsfgImageHistory out_images;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_beta.cpp

@@ -1,147 +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
-
-#include <vector>
-
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_beta.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DISPATCH_TILE_SHIFT = 3;
-constexpr u32 OUTPUT_TILE_SHIFT = 5;
-
-[[nodiscard]] u32 GroupCount(u32 size, u32 shift) {
-    return (size + (1u << shift) - 1) >> shift;
-}
-
-} // Anonymous namespace
-
-LsfgBeta::LsfgBeta(const Device& device, MemoryAllocator& memory_allocator,
-                   const LsfgShaders& shaders, LsfgResources& resources,
-                   vk::DescriptorPool& descriptor_pool, LsfgImageHistory& inputs_)
-    : inputs{&inputs_} {
-    using namespace VideoCore::FrameGen::PerformanceShader;
-
-    passes[0] = LsfgPass(device, shaders, BETA[0],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {6, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    for (size_t i = 1; i < LSFG_BETA_STAGES - 1; ++i) {
-        passes[i] = LsfgPass(device, shaders, BETA[i],
-                             {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                              {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                              {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    }
-    passes[4] = LsfgPass(device, shaders, BETA[4],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {6, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-
-    const VkExtent2D extent = (*inputs)[0][0].Extent();
-    for (size_t i = 0; i < temp1.size(); ++i) {
-        temp1[i] = LsfgImage(device, memory_allocator, extent);
-        temp2[i] = LsfgImage(device, memory_allocator, extent);
-    }
-    for (size_t i = 0; i < LSFG_BETA_OUTPUTS; ++i) {
-        const VkExtent2D level_extent{
-            .width = extent.width >> i,
-            .height = extent.height >> i,
-        };
-        out_images[i] = LsfgImage(device, memory_allocator, level_extent, LSFG_FLOW_FORMAT);
-    }
-
-    std::vector<VkDescriptorSetLayout> layouts;
-    for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-        layouts.push_back(passes[0].SetLayout());
-    }
-    for (size_t i = 1; i < LSFG_BETA_STAGES; ++i) {
-        layouts.push_back(passes[i].SetLayout());
-    }
-    owned_sets = CreateWrappedDescriptorSets(descriptor_pool, layouts);
-
-    for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-        first_descriptor_sets[i] = owned_sets[i];
-    }
-    for (size_t i = 0; i < LSFG_BETA_STAGES - 1; ++i) {
-        descriptor_sets[i] = owned_sets[LSFG_HISTORY_SLOTS + i];
-    }
-
-    const VkSampler sampler = resources.GetSampler();
-    const VkSampler border_sampler = resources.GetSampler(
-        VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER, VK_COMPARE_OP_NEVER, true);
-
-    for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-        LsfgDescriptorWriter(first_descriptor_sets[i])
-            .AddSampler(border_sampler)
-            .AddSampledImages((*inputs)[(i + 1) % LSFG_HISTORY_SLOTS])
-            .AddSampledImages((*inputs)[(i + 2) % LSFG_HISTORY_SLOTS])
-            .AddSampledImages((*inputs)[i % LSFG_HISTORY_SLOTS])
-            .AddStorageImages(temp1)
-            .Build(device);
-    }
-    LsfgDescriptorWriter(descriptor_sets[0])
-        .AddSampler(sampler)
-        .AddSampledImages(temp1)
-        .AddStorageImages(temp2)
-        .Build(device);
-    LsfgDescriptorWriter(descriptor_sets[1])
-        .AddSampler(sampler)
-        .AddSampledImages(temp2)
-        .AddStorageImages(temp1)
-        .Build(device);
-    LsfgDescriptorWriter(descriptor_sets[2])
-        .AddSampler(sampler)
-        .AddSampledImages(temp1)
-        .AddStorageImages(temp2)
-        .Build(device);
-    LsfgDescriptorWriter(descriptor_sets[3])
-        .AddUniformBuffer(resources.GetBuffer(0.5f), LsfgResources::BufferSize())
-        .AddSampler(sampler)
-        .AddSampledImages(temp2)
-        .AddStorageImages(out_images)
-        .Build(device);
-}
-
-void LsfgBeta::Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count) {
-    const VkExtent2D extent = temp1[0].Extent();
-    const u32 groups_x = GroupCount(extent.width, DISPATCH_TILE_SHIFT);
-    const u32 groups_y = GroupCount(extent.height, DISPATCH_TILE_SHIFT);
-
-    LsfgBarriers barriers(cmdbuf);
-    for (auto& slot : *inputs) {
-        barriers.WriteToReadAll(slot);
-    }
-    barriers.ReadToWriteAll(temp1).Build();
-
-    passes[0].Bind(cmdbuf, first_descriptor_sets[frame_count % LSFG_HISTORY_SLOTS]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp1).ReadToWriteAll(temp2).Build();
-    passes[1].Bind(cmdbuf, descriptor_sets[0]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp2).ReadToWriteAll(temp1).Build();
-    passes[2].Bind(cmdbuf, descriptor_sets[1]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp1).ReadToWriteAll(temp2).Build();
-    passes[3].Bind(cmdbuf, descriptor_sets[2]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp2).ReadToWriteAll(out_images).Build();
-    passes[4].Bind(cmdbuf, descriptor_sets[3]);
-    cmdbuf.Dispatch(GroupCount(extent.width, OUTPUT_TILE_SHIFT),
-                    GroupCount(extent.height, OUTPUT_TILE_SHIFT), 1);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_beta.h

@@ -1,48 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr size_t LSFG_BETA_STAGES = 5;
-constexpr size_t LSFG_BETA_OUTPUTS = 6;
-
-class LsfgBeta {
-public:
-    LsfgBeta() = default;
-    LsfgBeta(const Device& device, MemoryAllocator& memory_allocator, const LsfgShaders& shaders,
-             LsfgResources& resources, vk::DescriptorPool& descriptor_pool,
-             LsfgImageHistory& inputs);
-
-    void Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count);
-
-    [[nodiscard]] LsfgImage& Output(size_t level) {
-        return out_images[level];
-    }
-
-private:
-    LsfgImageHistory* inputs{};
-
-    std::array<LsfgPass, LSFG_BETA_STAGES> passes;
-    std::array<VkDescriptorSet, LSFG_HISTORY_SLOTS> first_descriptor_sets{};
-    std::array<VkDescriptorSet, LSFG_BETA_STAGES - 1> descriptor_sets{};
-    vk::DescriptorSets owned_sets;
-
-    LsfgImagePair temp1;
-    LsfgImagePair temp2;
-    std::array<LsfgImage, LSFG_BETA_OUTPUTS> out_images;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_chain.cpp

@@ -1,103 +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
-
-#include <algorithm>
-
-#include "video_core/renderer_vulkan/present/lsfg_chain.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 FIXED_DESCRIPTOR_SETS = 64;
-constexpr u32 DESCRIPTOR_SETS_PER_SLOT = 112;
-constexpr size_t FIRST_DELTA_LEVEL = 4;
-
-} // Anonymous namespace
-
-LsfgChain::LsfgChain(const Device& device, MemoryAllocator& memory_allocator,
-                     const LsfgShaders& shaders, VkExtent2D extent, VkFormat format,
-                     f32 flow_scale)
-    : resources{device, memory_allocator, flow_scale},
-      descriptor_pool{CreateLsfgDescriptorPool(
-          device, FIXED_DESCRIPTOR_SETS +
-                      DESCRIPTOR_SETS_PER_SLOT * static_cast<u32>(LSFG_GENERATION_SLOTS))} {
-    for (auto& image : frames) {
-        image = LsfgImage(device, memory_allocator, extent, format);
-    }
-
-    mipmaps = LsfgMipmaps(device, memory_allocator, shaders, resources, descriptor_pool, frames,
-                          flow_scale);
-
-    alpha_passes = LsfgAlphaPasses(device, shaders);
-    for (size_t i = 0; i < LSFG_MIP_LEVELS; ++i) {
-        alpha[i] = LsfgAlpha(device, memory_allocator, alpha_passes, resources, descriptor_pool,
-                             mipmaps.Output(i));
-    }
-
-    beta = LsfgBeta(device, memory_allocator, shaders, resources, descriptor_pool,
-                    alpha[0].Outputs());
-
-    for (size_t i = 0; i < LSFG_MIP_LEVELS; ++i) {
-        const size_t level = LSFG_MIP_LEVELS - 1 - i;
-        gamma[i] = LsfgGamma(device, memory_allocator, shaders, resources, descriptor_pool,
-                             alpha[level].Outputs(),
-                             beta.Output(std::min(level, LSFG_BETA_OUTPUTS - 1)),
-                             i == 0 ? nullptr : &gamma[i - 1].Output());
-
-        if (i < FIRST_DELTA_LEVEL) {
-            continue;
-        }
-
-        const size_t index = i - FIRST_DELTA_LEVEL;
-        delta[index] = LsfgDelta(
-            device, memory_allocator, shaders, resources, descriptor_pool, alpha[level].Outputs(),
-            beta.Output(level), i == FIRST_DELTA_LEVEL ? nullptr : &gamma[i - 1].Output(),
-            i == FIRST_DELTA_LEVEL ? nullptr : &delta[index - 1].Output1(),
-            i == FIRST_DELTA_LEVEL ? nullptr : &delta[index - 1].Output2());
-    }
-
-    generate = LsfgGenerate(device, shaders, resources, descriptor_pool, frames,
-                            gamma[LSFG_MIP_LEVELS - 1].Output(),
-                            delta[LSFG_DELTA_INSTANCES - 1].Output1(),
-                            delta[LSFG_DELTA_INSTANCES - 1].Output2());
-}
-
-void LsfgChain::DispatchShared(vk::CommandBuffer cmdbuf, u64 frame_count) {
-    mipmaps.Dispatch(cmdbuf, frame_count);
-
-    for (size_t stage = 0; stage < LSFG_ALPHA_STAGES; ++stage) {
-        LsfgBarriers barriers(cmdbuf);
-        for (auto& level : alpha) {
-            level.PushBarriers(barriers, frame_count, stage);
-        }
-        barriers.Build();
-
-        alpha_passes.Get(stage).BindPipeline(cmdbuf);
-        for (auto& level : alpha) {
-            level.DispatchStage(cmdbuf, frame_count, stage);
-        }
-    }
-
-    beta.Dispatch(cmdbuf, frame_count);
-}
-
-void LsfgChain::DispatchGeneration(vk::CommandBuffer cmdbuf, u64 frame_count,
-                                   size_t generation_count, size_t generation, u32 target,
-                                   VkImage image, VkExtent2D extent) {
-    const size_t slot = LsfgGenerationSlot(generation_count, generation);
-    for (size_t i = 0; i < LSFG_MIP_LEVELS; ++i) {
-        gamma[i].Dispatch(cmdbuf, frame_count, slot);
-        if (i >= FIRST_DELTA_LEVEL) {
-            delta[i - FIRST_DELTA_LEVEL].Dispatch(cmdbuf, frame_count, slot);
-        }
-    }
-    generate.Dispatch(cmdbuf, frame_count, slot, target, image, extent);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_chain.h

@@ -1,87 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_alpha.h"
-#include "video_core/renderer_vulkan/present/lsfg_beta.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-#include "video_core/renderer_vulkan/present/lsfg_delta.h"
-#include "video_core/renderer_vulkan/present/lsfg_gamma.h"
-#include "video_core/renderer_vulkan/present/lsfg_generate.h"
-#include "video_core/renderer_vulkan/present/lsfg_mipmaps.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr size_t LSFG_DELTA_INSTANCES = 3;
-
-class LsfgChain {
-public:
-    LsfgChain(const Device& device, MemoryAllocator& memory_allocator, const LsfgShaders& shaders,
-              VkExtent2D extent, VkFormat format, f32 flow_scale);
-
-    LsfgChain(const LsfgChain&) = delete;
-    LsfgChain& operator=(const LsfgChain&) = delete;
-
-    void DispatchShared(vk::CommandBuffer cmdbuf, u64 frame_count);
-
-    void DispatchGeneration(vk::CommandBuffer cmdbuf, u64 frame_count, size_t generation_count,
-                            size_t generation, u32 target, VkImage image, VkExtent2D extent);
-
-    void SetTarget(const Device& device, size_t generation_count, size_t generation, u32 target,
-                   VkImageView view) {
-        generate.SetTarget(device, LsfgGenerationSlot(generation_count, generation), target, view);
-    }
-
-    [[nodiscard]] LsfgImage& Input(u64 frame_count) {
-        return frames[frame_count % frames.size()];
-    }
-
-    [[nodiscard]] LsfgImage& FlowLevel(size_t level) {
-        return mipmaps.Output(level);
-    }
-
-    [[nodiscard]] LsfgImage& AlphaOutput(size_t level, u64 frame_count, size_t index) {
-        return alpha[level].Outputs()[frame_count % LSFG_HISTORY_SLOTS][index];
-    }
-
-    [[nodiscard]] LsfgImage& BetaOutput(size_t level) {
-        return beta.Output(level);
-    }
-
-    [[nodiscard]] LsfgImage& GammaOutput(size_t index) {
-        return gamma[index].Output();
-    }
-
-    [[nodiscard]] LsfgImage& DeltaOutput1(size_t index) {
-        return delta[index].Output1();
-    }
-
-    [[nodiscard]] LsfgImage& DeltaOutput2(size_t index) {
-        return delta[index].Output2();
-    }
-
-private:
-    LsfgResources resources;
-    vk::DescriptorPool descriptor_pool;
-
-    LsfgImagePair frames;
-    LsfgMipmaps mipmaps;
-    LsfgAlphaPasses alpha_passes;
-    std::array<LsfgAlpha, LSFG_MIP_LEVELS> alpha;
-    LsfgBeta beta;
-    std::array<LsfgGamma, LSFG_MIP_LEVELS> gamma;
-    std::array<LsfgDelta, LSFG_DELTA_INSTANCES> delta;
-    LsfgGenerate generate;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_common.cpp

@@ -1,339 +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
-
-#include <algorithm>
-#include <cstring>
-
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DESCRIPTORS_PER_TYPE = 4096;
-
-struct LsfgConstants {
-    std::array<u32, 2> input_offset;
-    u32 first_iter;
-    u32 first_iter_s;
-    u32 advanced_color_kind;
-    u32 hdr_support;
-    f32 resolution_inv_scale;
-    f32 timestamp;
-    f32 ui_threshold;
-    std::array<u32, 3> padding;
-};
-static_assert(sizeof(LsfgConstants) == 48);
-
-vk::Image CreateChainImage(MemoryAllocator& memory_allocator, VkExtent2D extent, VkFormat format) {
-    const VkImageCreateInfo image_ci{
-        .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .imageType = VK_IMAGE_TYPE_2D,
-        .format = format,
-        .extent = {.width = extent.width, .height = extent.height, .depth = 1},
-        .mipLevels = 1,
-        .arrayLayers = 1,
-        .samples = VK_SAMPLE_COUNT_1_BIT,
-        .tiling = VK_IMAGE_TILING_OPTIMAL,
-        .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-                 VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
-        .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
-        .queueFamilyIndexCount = 0,
-        .pQueueFamilyIndices = nullptr,
-        .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,
-    };
-    return memory_allocator.CreateImage(image_ci);
-}
-
-vk::Buffer CreateUniformBuffer(MemoryAllocator& memory_allocator, VkDeviceSize size) {
-    const VkBufferCreateInfo buffer_ci{
-        .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .size = size,
-        .usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT,
-        .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
-        .queueFamilyIndexCount = 0,
-        .pQueueFamilyIndices = nullptr,
-    };
-    return memory_allocator.CreateBuffer(buffer_ci, MemoryUsage::Upload);
-}
-
-VkImageMemoryBarrier MakeBarrier(const LsfgImage& image, VkAccessFlags src_access,
-                                 VkAccessFlags dst_access) {
-    return VkImageMemoryBarrier{
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = nullptr,
-        .srcAccessMask = src_access,
-        .dstAccessMask = dst_access,
-        .oldLayout = image.Layout(),
-        .newLayout = VK_IMAGE_LAYOUT_GENERAL,
-        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .image = image.Handle(),
-        .subresourceRange{
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-            .baseMipLevel = 0,
-            .levelCount = 1,
-            .baseArrayLayer = 0,
-            .layerCount = 1,
-        },
-    };
-}
-
-} // Anonymous namespace
-
-LsfgImage::LsfgImage(const Device& device, MemoryAllocator& memory_allocator, VkExtent2D extent_,
-                     VkFormat format_)
-    : extent{std::max(1u, extent_.width), std::max(1u, extent_.height)}, format{format_} {
-    image = CreateChainImage(memory_allocator, extent, format);
-    view = CreateWrappedImageView(device, image, format);
-}
-
-LsfgBarriers& LsfgBarriers::Push(LsfgImage& image, VkAccessFlags src_access,
-                                 VkAccessFlags dst_access) {
-    barriers.push_back(MakeBarrier(image, src_access, dst_access));
-    image.SetLayout(VK_IMAGE_LAYOUT_GENERAL);
-    return *this;
-}
-
-LsfgBarriers& LsfgBarriers::WriteToRead(LsfgImage& image) {
-    return Push(image, VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT);
-}
-
-LsfgBarriers& LsfgBarriers::ReadToWrite(LsfgImage& image) {
-    return Push(image, VK_ACCESS_SHADER_READ_BIT, VK_ACCESS_SHADER_WRITE_BIT);
-}
-
-LsfgBarriers& LsfgBarriers::WriteToRead(LsfgImage* image) {
-    return image == nullptr ? *this : WriteToRead(*image);
-}
-
-LsfgBarriers& LsfgBarriers::ReadToWrite(LsfgImage* image) {
-    return image == nullptr ? *this : ReadToWrite(*image);
-}
-
-LsfgBarriers& LsfgBarriers::DiscardToWrite(VkImage image) {
-    barriers.push_back(VkImageMemoryBarrier{
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = nullptr,
-        .srcAccessMask = 0,
-        .dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
-        .oldLayout = VK_IMAGE_LAYOUT_UNDEFINED,
-        .newLayout = VK_IMAGE_LAYOUT_GENERAL,
-        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .image = image,
-        .subresourceRange{
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-            .baseMipLevel = 0,
-            .levelCount = 1,
-            .baseArrayLayer = 0,
-            .layerCount = 1,
-        },
-    });
-    return *this;
-}
-
-VkDeviceSize LsfgResources::BufferSize() {
-    return sizeof(LsfgConstants);
-}
-
-VkSampler LsfgResources::GetSampler(VkSamplerAddressMode address_mode, VkCompareOp compare_op,
-                                    bool white_border) {
-    const u64 key = static_cast<u64>(address_mode) | (static_cast<u64>(compare_op) << 8) |
-                    (static_cast<u64>(white_border) << 16);
-
-    const auto it = samplers.find(key);
-    if (it != samplers.end()) {
-        return *it->second;
-    }
-
-    const auto [entry, inserted] =
-        samplers.emplace(key, CreateLsfgSampler(*device, address_mode, compare_op, white_border));
-    return *entry->second;
-}
-
-VkBuffer LsfgResources::GetBuffer(f32 timestamp, bool first_iter, bool first_iter_s) {
-    u32 timestamp_bits{};
-    std::memcpy(&timestamp_bits, &timestamp, sizeof(timestamp_bits));
-    const u64 key = static_cast<u64>(timestamp_bits) | (static_cast<u64>(first_iter) << 32) |
-                    (static_cast<u64>(first_iter_s) << 33);
-
-    const auto it = buffers.find(key);
-    if (it != buffers.end()) {
-        return *it->second;
-    }
-
-    vk::Buffer buffer = CreateUniformBuffer(*memory_allocator, sizeof(LsfgConstants));
-
-    const LsfgConstants constants{
-        .input_offset = {0, 0},
-        .first_iter = first_iter ? 1u : 0u,
-        .first_iter_s = first_iter_s ? 1u : 0u,
-        .advanced_color_kind = 0,
-        .hdr_support = 0,
-        .resolution_inv_scale = 1.0f / flow_scale,
-        .timestamp = timestamp,
-        .ui_threshold = 0.5f,
-        .padding = {0, 0, 0},
-    };
-
-    const std::span<u8> mapped = buffer.Mapped();
-    std::memcpy(mapped.data(), &constants, sizeof(constants));
-    buffer.Flush();
-
-    const auto [entry, inserted] = buffers.emplace(key, std::move(buffer));
-    return *entry->second;
-}
-
-void LsfgBarriers::Build() {
-    if (barriers.empty()) {
-        return;
-    }
-    cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-                           VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, {}, {}, barriers);
-    barriers.clear();
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::PushImage(VkDescriptorType type, VkSampler sampler,
-                                                      VkImageView view) {
-    image_infos.push_back(VkDescriptorImageInfo{
-        .sampler = sampler,
-        .imageView = view,
-        .imageLayout = view == VK_NULL_HANDLE ? VK_IMAGE_LAYOUT_UNDEFINED
-                                              : VK_IMAGE_LAYOUT_GENERAL,
-    });
-    writes.push_back(VkWriteDescriptorSet{
-        .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-        .pNext = nullptr,
-        .dstSet = set,
-        .dstBinding = binding++,
-        .dstArrayElement = 0,
-        .descriptorCount = 1,
-        .descriptorType = type,
-        .pImageInfo = &image_infos.back(),
-        .pBufferInfo = nullptr,
-        .pTexelBufferView = nullptr,
-    });
-    return *this;
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::AddSampler(VkSampler sampler) {
-    return PushImage(VK_DESCRIPTOR_TYPE_SAMPLER, sampler, VK_NULL_HANDLE);
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::AddSampledImage(const LsfgImage& image) {
-    return PushImage(VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VK_NULL_HANDLE, image.View());
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::AddSampledImage(const LsfgImage* image) {
-    return PushImage(VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VK_NULL_HANDLE,
-                     image == nullptr ? VK_NULL_HANDLE : image->View());
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::AddStorageImage(const LsfgImage& image) {
-    return PushImage(VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, VK_NULL_HANDLE, image.View());
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::AddStorageView(VkImageView view) {
-    return PushImage(VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, VK_NULL_HANDLE, view);
-}
-
-LsfgDescriptorWriter& LsfgDescriptorWriter::AddUniformBuffer(VkBuffer buffer, VkDeviceSize size) {
-    buffer_infos.push_back(VkDescriptorBufferInfo{
-        .buffer = buffer,
-        .offset = 0,
-        .range = size,
-    });
-    writes.push_back(VkWriteDescriptorSet{
-        .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
-        .pNext = nullptr,
-        .dstSet = set,
-        .dstBinding = binding++,
-        .dstArrayElement = 0,
-        .descriptorCount = 1,
-        .descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-        .pImageInfo = nullptr,
-        .pBufferInfo = &buffer_infos.back(),
-        .pTexelBufferView = nullptr,
-    });
-    return *this;
-}
-
-void LsfgDescriptorWriter::Build(const Device& device) {
-    if (writes.empty()) {
-        return;
-    }
-    device.GetLogical().UpdateDescriptorSets(writes, {});
-    writes.clear();
-}
-
-LsfgPass::LsfgPass(const Device& device, const LsfgShaders& shaders, u32 shader_id,
-                   LsfgBindings bindings) {
-    std::vector<VkDescriptorType> types;
-    for (const auto& [count, type] : bindings) {
-        types.insert(types.end(), count, type);
-    }
-    descriptor_count = static_cast<u32>(types.size());
-
-    descriptor_set_layout = CreateWrappedDescriptorSetLayout(
-        device, std::span<const VkDescriptorType>{types}, VK_SHADER_STAGE_COMPUTE_BIT);
-    pipeline_layout = CreateWrappedPipelineLayout(device, descriptor_set_layout);
-    pipeline = CreateWrappedComputePipeline(device, pipeline_layout, shaders.Get(shader_id));
-}
-
-void LsfgPass::Bind(vk::CommandBuffer cmdbuf, VkDescriptorSet set) const {
-    BindPipeline(cmdbuf);
-    BindSet(cmdbuf, set);
-}
-
-void LsfgPass::BindPipeline(vk::CommandBuffer cmdbuf) const {
-    cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);
-}
-
-void LsfgPass::BindSet(vk::CommandBuffer cmdbuf, VkDescriptorSet set) const {
-    cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline_layout, 0, set, {});
-}
-
-vk::DescriptorPool CreateLsfgDescriptorPool(const Device& device, u32 max_sets) {
-    return CreateWrappedDescriptorPool(
-        device, DESCRIPTORS_PER_TYPE, max_sets,
-        {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_DESCRIPTOR_TYPE_SAMPLER,
-         VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE});
-}
-
-vk::Sampler CreateLsfgSampler(const Device& device, VkSamplerAddressMode address_mode,
-                              VkCompareOp compare_op, bool white_border) {
-    return device.GetLogical().CreateSampler(VkSamplerCreateInfo{
-        .sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .magFilter = VK_FILTER_LINEAR,
-        .minFilter = VK_FILTER_LINEAR,
-        .mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR,
-        .addressModeU = address_mode,
-        .addressModeV = address_mode,
-        .addressModeW = address_mode,
-        .mipLodBias = 0.0f,
-        .anisotropyEnable = VK_FALSE,
-        .maxAnisotropy = 0.0f,
-        .compareEnable = VK_FALSE,
-        .compareOp = compare_op,
-        .minLod = 0.0f,
-        .maxLod = VK_LOD_CLAMP_NONE,
-        .borderColor = white_border ? VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE
-                                    : VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK,
-        .unnormalizedCoordinates = VK_FALSE,
-    });
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_common.h

@@ -1,227 +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 <deque>
-#include <initializer_list>
-#include <map>
-#include <utility>
-#include <vector>
-
-#include "common/common_types.h"
-#include "video_core/vulkan_common/vulkan_memory_allocator.h"
-#include "video_core/vulkan_common/vulkan_wrapper.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr VkFormat LSFG_DEFAULT_FORMAT = VK_FORMAT_R8G8B8A8_UNORM;
-constexpr VkFormat LSFG_FLOW_FORMAT = VK_FORMAT_R8_UNORM;
-constexpr VkFormat LSFG_MOTION_FORMAT = VK_FORMAT_R16G16B16A16_SFLOAT;
-
-constexpr size_t LSFG_HISTORY_SLOTS = 3;
-constexpr size_t LSFG_MAX_TARGETS = 7;
-constexpr size_t LSFG_MAX_GENERATIONS = 3;
-
-constexpr size_t LSFG_GENERATION_SLOTS = LSFG_MAX_GENERATIONS * (LSFG_MAX_GENERATIONS + 1) / 2;
-
-[[nodiscard]] constexpr size_t LsfgGenerationSlot(size_t generation_count, size_t generation) {
-    return (generation_count - 1) * generation_count / 2 + generation;
-}
-
-[[nodiscard]] constexpr f32 LsfgTimestamp(size_t generation, size_t generation_count) {
-    return static_cast<f32>(generation + 1) / static_cast<f32>(generation_count + 1);
-}
-
-[[nodiscard]] constexpr size_t LsfgSlotCount(size_t slot) {
-    size_t count = 1;
-    while (LsfgGenerationSlot(count + 1, 0) <= slot) {
-        ++count;
-    }
-    return count;
-}
-
-[[nodiscard]] constexpr f32 LsfgSlotTimestamp(size_t slot) {
-    const size_t count = LsfgSlotCount(slot);
-    return LsfgTimestamp(slot - LsfgGenerationSlot(count, 0), count);
-}
-
-class LsfgImage {
-public:
-    LsfgImage() = default;
-    LsfgImage(const Device& device, MemoryAllocator& memory_allocator, VkExtent2D extent_,
-              VkFormat format = LSFG_DEFAULT_FORMAT);
-
-    [[nodiscard]] VkImage Handle() const {
-        return *image;
-    }
-
-    [[nodiscard]] VkImageView View() const {
-        return *view;
-    }
-
-    [[nodiscard]] VkExtent2D Extent() const {
-        return extent;
-    }
-
-    [[nodiscard]] VkFormat Format() const {
-        return format;
-    }
-
-    [[nodiscard]] VkImageLayout Layout() const {
-        return layout;
-    }
-
-    void SetLayout(VkImageLayout new_layout) {
-        layout = new_layout;
-    }
-
-private:
-    vk::Image image;
-    vk::ImageView view;
-    VkExtent2D extent{};
-    VkFormat format{VK_FORMAT_UNDEFINED};
-    VkImageLayout layout{VK_IMAGE_LAYOUT_UNDEFINED};
-};
-
-using LsfgImagePair = std::array<LsfgImage, 2>;
-using LsfgImageHistory = std::array<LsfgImagePair, LSFG_HISTORY_SLOTS>;
-
-class LsfgResources {
-public:
-    LsfgResources() = default;
-    LsfgResources(const Device& device_, MemoryAllocator& memory_allocator_, f32 flow_scale_)
-        : device{&device_}, memory_allocator{&memory_allocator_}, flow_scale{flow_scale_} {}
-
-    [[nodiscard]] VkSampler GetSampler(
-        VkSamplerAddressMode address_mode = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER,
-        VkCompareOp compare_op = VK_COMPARE_OP_NEVER, bool white_border = false);
-
-    [[nodiscard]] VkBuffer GetBuffer(f32 timestamp = 0.0f, bool first_iter = false,
-                                     bool first_iter_s = false);
-
-    [[nodiscard]] static VkDeviceSize BufferSize();
-
-private:
-    const Device* device{};
-    MemoryAllocator* memory_allocator{};
-    f32 flow_scale{1.0f};
-
-    std::map<u64, vk::Sampler> samplers;
-    std::map<u64, vk::Buffer> buffers;
-};
-
-class LsfgBarriers {
-public:
-    explicit LsfgBarriers(vk::CommandBuffer cmdbuf_) : cmdbuf{cmdbuf_} {}
-
-    LsfgBarriers& WriteToRead(LsfgImage& image);
-    LsfgBarriers& ReadToWrite(LsfgImage& image);
-    LsfgBarriers& WriteToRead(LsfgImage* image);
-    LsfgBarriers& ReadToWrite(LsfgImage* image);
-    LsfgBarriers& DiscardToWrite(VkImage image);
-
-    template <typename Range>
-    LsfgBarriers& WriteToReadAll(Range& images) {
-        for (auto& image : images) {
-            WriteToRead(image);
-        }
-        return *this;
-    }
-
-    template <typename Range>
-    LsfgBarriers& ReadToWriteAll(Range& images) {
-        for (auto& image : images) {
-            ReadToWrite(image);
-        }
-        return *this;
-    }
-
-    void Build();
-
-private:
-    LsfgBarriers& Push(LsfgImage& image, VkAccessFlags src_access, VkAccessFlags dst_access);
-
-    vk::CommandBuffer cmdbuf;
-    std::vector<VkImageMemoryBarrier> barriers;
-};
-
-class LsfgDescriptorWriter {
-public:
-    explicit LsfgDescriptorWriter(VkDescriptorSet set_) : set{set_} {}
-
-    LsfgDescriptorWriter& AddSampler(VkSampler sampler);
-    LsfgDescriptorWriter& AddSampledImage(const LsfgImage& image);
-    LsfgDescriptorWriter& AddSampledImage(const LsfgImage* image);
-    LsfgDescriptorWriter& AddStorageImage(const LsfgImage& image);
-    LsfgDescriptorWriter& AddStorageView(VkImageView view);
-    LsfgDescriptorWriter& AddUniformBuffer(VkBuffer buffer, VkDeviceSize size);
-
-    template <typename Range>
-    LsfgDescriptorWriter& AddSampledImages(const Range& images) {
-        for (const auto& image : images) {
-            AddSampledImage(image);
-        }
-        return *this;
-    }
-
-    template <typename Range>
-    LsfgDescriptorWriter& AddStorageImages(const Range& images) {
-        for (const auto& image : images) {
-            AddStorageImage(image);
-        }
-        return *this;
-    }
-
-    void Build(const Device& device);
-
-private:
-    LsfgDescriptorWriter& PushImage(VkDescriptorType type, VkSampler sampler, VkImageView view);
-
-    VkDescriptorSet set;
-    u32 binding{};
-    std::deque<VkDescriptorImageInfo> image_infos;
-    std::deque<VkDescriptorBufferInfo> buffer_infos;
-    std::vector<VkWriteDescriptorSet> writes;
-};
-
-using LsfgBindings = std::initializer_list<std::pair<u32, VkDescriptorType>>;
-
-class LsfgPass {
-public:
-    LsfgPass() = default;
-    LsfgPass(const Device& device, const LsfgShaders& shaders, u32 shader_id,
-             LsfgBindings bindings);
-
-    [[nodiscard]] VkDescriptorSetLayout SetLayout() const {
-        return *descriptor_set_layout;
-    }
-
-    [[nodiscard]] u32 DescriptorCount() const {
-        return descriptor_count;
-    }
-
-    void Bind(vk::CommandBuffer cmdbuf, VkDescriptorSet set) const;
-    void BindPipeline(vk::CommandBuffer cmdbuf) const;
-    void BindSet(vk::CommandBuffer cmdbuf, VkDescriptorSet set) const;
-
-private:
-    vk::DescriptorSetLayout descriptor_set_layout;
-    vk::PipelineLayout pipeline_layout;
-    vk::Pipeline pipeline;
-    u32 descriptor_count{};
-};
-
-[[nodiscard]] vk::DescriptorPool CreateLsfgDescriptorPool(const Device& device, u32 max_sets);
-
-[[nodiscard]] vk::Sampler CreateLsfgSampler(const Device& device, VkSamplerAddressMode address_mode,
-                                            VkCompareOp compare_op, bool white_border);
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_delta.cpp

@@ -1,283 +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
-
-#include <vector>
-
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_delta.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DISPATCH_TILE_SHIFT = 3;
-
-[[nodiscard]] u32 GroupCount(u32 size) {
-    return (size + (1u << DISPATCH_TILE_SHIFT) - 1) >> DISPATCH_TILE_SHIFT;
-}
-
-} // Anonymous namespace
-
-LsfgDelta::LsfgDelta(const Device& device, MemoryAllocator& memory_allocator,
-                     const LsfgShaders& shaders, LsfgResources& resources,
-                     vk::DescriptorPool& descriptor_pool, LsfgImageHistory& inputs_,
-                     LsfgImage& flow_input_, LsfgImage* previous_gamma_, LsfgImage* previous1_,
-                     LsfgImage* previous2_)
-    : inputs{&inputs_}, flow_input{&flow_input_}, previous_gamma{previous_gamma_},
-      previous1{previous1_}, previous2{previous2_} {
-    using namespace VideoCore::FrameGen::PerformanceShader;
-
-    passes[0] = LsfgPass(device, shaders, DELTA[0],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {5, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {3, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[1] = LsfgPass(device, shaders, DELTA[1],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {3, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[2] = LsfgPass(device, shaders, DELTA[2],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[3] = LsfgPass(device, shaders, DELTA[3],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[4] = LsfgPass(device, shaders, DELTA[4],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {4, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[5] = LsfgPass(device, shaders, DELTA[5],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {6, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    for (size_t i = 6; i < LSFG_DELTA_STAGES - 1; ++i) {
-        passes[i] = LsfgPass(device, shaders, DELTA[i],
-                             {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                              {1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                              {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    }
-    passes[9] = LsfgPass(device, shaders, DELTA[9],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-
-    const VkExtent2D extent = (*inputs)[0][0].Extent();
-    for (auto& image : temp1) {
-        image = LsfgImage(device, memory_allocator, extent);
-    }
-    for (auto& image : temp2) {
-        image = LsfgImage(device, memory_allocator, extent);
-    }
-    out_image1 = LsfgImage(device, memory_allocator, extent, LSFG_MOTION_FORMAT);
-    out_image2 = LsfgImage(device, memory_allocator, extent, LSFG_MOTION_FORMAT);
-
-    std::vector<VkDescriptorSetLayout> layouts;
-    for (size_t slot = 0; slot < LSFG_GENERATION_SLOTS; ++slot) {
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            layouts.push_back(passes[0].SetLayout());
-        }
-        for (size_t i = 1; i <= 4; ++i) {
-            layouts.push_back(passes[i].SetLayout());
-        }
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            layouts.push_back(passes[5].SetLayout());
-        }
-        for (size_t i = 6; i < LSFG_DELTA_STAGES; ++i) {
-            layouts.push_back(passes[i].SetLayout());
-        }
-    }
-    owned_sets = CreateWrappedDescriptorSets(descriptor_pool, layouts);
-
-    const VkSampler sampler = resources.GetSampler();
-    const VkSampler border_sampler = resources.GetSampler(
-        VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER, VK_COMPARE_OP_NEVER, true);
-    const VkSampler edge_sampler =
-        resources.GetSampler(VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VK_COMPARE_OP_ALWAYS, false);
-    size_t next = 0;
-    for (size_t slot = 0; slot < LSFG_GENERATION_SLOTS; ++slot) {
-        Generation& pass = generations[slot];
-        const VkBuffer buffer =
-            resources.GetBuffer(LsfgSlotTimestamp(slot), false, previous_gamma == nullptr);
-
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            pass.first_descriptor_sets[i] = owned_sets[next++];
-        }
-        for (size_t i = 0; i < 4; ++i) {
-            pass.descriptor_sets[i] = owned_sets[next++];
-        }
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            pass.sixth_descriptor_sets[i] = owned_sets[next++];
-        }
-        for (size_t i = 4; i < LSFG_DELTA_STAGES - 2; ++i) {
-            pass.descriptor_sets[i] = owned_sets[next++];
-        }
-
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            LsfgDescriptorWriter(pass.first_descriptor_sets[i])
-                .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-                .AddSampler(border_sampler)
-                .AddSampler(edge_sampler)
-                .AddSampledImages((*inputs)[(i + 2) % LSFG_HISTORY_SLOTS])
-                .AddSampledImages((*inputs)[i % LSFG_HISTORY_SLOTS])
-                .AddSampledImage(previous_gamma)
-                .AddStorageImages(temp1)
-                .Build(device);
-            LsfgDescriptorWriter(pass.sixth_descriptor_sets[i])
-                .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-                .AddSampler(border_sampler)
-                .AddSampler(edge_sampler)
-                .AddSampledImages((*inputs)[(i + 2) % LSFG_HISTORY_SLOTS])
-                .AddSampledImages((*inputs)[i % LSFG_HISTORY_SLOTS])
-                .AddSampledImage(previous_gamma)
-                .AddSampledImage(previous1)
-                .AddStorageImage(temp2[0])
-                .Build(device);
-        }
-        LsfgDescriptorWriter(pass.descriptor_sets[0])
-            .AddSampler(sampler)
-            .AddSampledImages(temp1)
-            .AddStorageImages(temp2)
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[1])
-            .AddSampler(sampler)
-            .AddSampledImages(temp2)
-            .AddStorageImage(temp1[0])
-            .AddStorageImage(temp1[1])
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[2])
-            .AddSampler(sampler)
-            .AddSampledImage(temp1[0])
-            .AddSampledImage(temp1[1])
-            .AddStorageImages(temp2)
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[3])
-            .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-            .AddSampler(sampler)
-            .AddSampler(edge_sampler)
-            .AddSampledImages(temp2)
-            .AddSampledImage(previous_gamma)
-            .AddSampledImage(*flow_input)
-            .AddStorageImage(out_image1)
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[4])
-            .AddSampler(sampler)
-            .AddSampledImage(temp2[0])
-            .AddStorageImage(temp1[0])
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[5])
-            .AddSampler(sampler)
-            .AddSampledImage(temp1[0])
-            .AddStorageImage(temp2[0])
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[6])
-            .AddSampler(sampler)
-            .AddSampledImage(temp2[0])
-            .AddStorageImage(temp1[0])
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[7])
-            .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-            .AddSampler(sampler)
-            .AddSampler(edge_sampler)
-            .AddSampledImage(temp1[0])
-            .AddSampledImage(previous2)
-            .AddStorageImage(out_image2)
-            .Build(device);
-    }
-}
-
-void LsfgDelta::Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count, size_t slot) {
-    const Generation& pass = generations[slot];
-
-    const VkExtent2D extent = temp1[0].Extent();
-    const u32 groups_x = GroupCount(extent.width);
-    const u32 groups_y = GroupCount(extent.height);
-
-    const size_t history = frame_count % LSFG_HISTORY_SLOTS;
-    const size_t previous_history = (frame_count + 2) % LSFG_HISTORY_SLOTS;
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll((*inputs)[previous_history])
-        .WriteToReadAll((*inputs)[history])
-        .WriteToRead(previous_gamma)
-        .ReadToWriteAll(temp1)
-        .Build();
-    passes[0].Bind(cmdbuf, pass.first_descriptor_sets[history]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp1).ReadToWriteAll(temp2).Build();
-    passes[1].Bind(cmdbuf, pass.descriptor_sets[0]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp2).ReadToWriteAll(temp1).Build();
-    passes[2].Bind(cmdbuf, pass.descriptor_sets[1]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp1).ReadToWriteAll(temp2).Build();
-    passes[3].Bind(cmdbuf, pass.descriptor_sets[2]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll(temp2)
-        .WriteToRead(previous_gamma)
-        .WriteToRead(*flow_input)
-        .ReadToWrite(out_image1)
-        .Build();
-    passes[4].Bind(cmdbuf, pass.descriptor_sets[3]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll((*inputs)[previous_history])
-        .WriteToReadAll((*inputs)[history])
-        .WriteToRead(previous_gamma)
-        .WriteToRead(previous1)
-        .ReadToWriteAll(temp2)
-        .Build();
-    passes[5].Bind(cmdbuf, pass.sixth_descriptor_sets[history]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll(temp2)
-        .ReadToWrite(temp1[0])
-        .ReadToWrite(temp1[1])
-        .Build();
-    passes[6].Bind(cmdbuf, pass.descriptor_sets[4]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToRead(temp1[0])
-        .WriteToRead(temp1[1])
-        .ReadToWriteAll(temp2)
-        .Build();
-    passes[7].Bind(cmdbuf, pass.descriptor_sets[5]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll(temp2)
-        .ReadToWrite(temp1[0])
-        .ReadToWrite(temp1[1])
-        .Build();
-    passes[8].Bind(cmdbuf, pass.descriptor_sets[6]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToRead(temp1[0])
-        .WriteToRead(temp1[1])
-        .WriteToRead(previous2)
-        .ReadToWrite(out_image2)
-        .Build();
-    passes[9].Bind(cmdbuf, pass.descriptor_sets[7]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_delta.h

@@ -1,63 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr size_t LSFG_DELTA_STAGES = 10;
-constexpr size_t LSFG_DELTA_TEMPS = 3;
-
-class LsfgDelta {
-public:
-    LsfgDelta() = default;
-    LsfgDelta(const Device& device, MemoryAllocator& memory_allocator, const LsfgShaders& shaders,
-              LsfgResources& resources, vk::DescriptorPool& descriptor_pool,
-              LsfgImageHistory& inputs, LsfgImage& flow_input, LsfgImage* previous_gamma,
-              LsfgImage* previous1, LsfgImage* previous2);
-
-    void Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count, size_t slot);
-
-    [[nodiscard]] LsfgImage& Output1() {
-        return out_image1;
-    }
-
-    [[nodiscard]] LsfgImage& Output2() {
-        return out_image2;
-    }
-
-private:
-    struct Generation {
-        std::array<VkDescriptorSet, LSFG_HISTORY_SLOTS> first_descriptor_sets{};
-        std::array<VkDescriptorSet, LSFG_HISTORY_SLOTS> sixth_descriptor_sets{};
-        std::array<VkDescriptorSet, LSFG_DELTA_STAGES - 2> descriptor_sets{};
-    };
-
-    LsfgImageHistory* inputs{};
-    LsfgImage* flow_input{};
-    LsfgImage* previous_gamma{};
-    LsfgImage* previous1{};
-    LsfgImage* previous2{};
-
-    std::array<LsfgPass, LSFG_DELTA_STAGES> passes;
-    std::array<Generation, LSFG_GENERATION_SLOTS> generations{};
-    vk::DescriptorSets owned_sets;
-
-    std::array<LsfgImage, LSFG_DELTA_TEMPS> temp1;
-    LsfgImagePair temp2;
-    LsfgImage out_image1;
-    LsfgImage out_image2;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_gamma.cpp

@@ -1,185 +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
-
-#include <vector>
-
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_gamma.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DISPATCH_TILE_SHIFT = 3;
-
-[[nodiscard]] u32 GroupCount(u32 size) {
-    return (size + (1u << DISPATCH_TILE_SHIFT) - 1) >> DISPATCH_TILE_SHIFT;
-}
-
-} // Anonymous namespace
-
-LsfgGamma::LsfgGamma(const Device& device, MemoryAllocator& memory_allocator,
-                     const LsfgShaders& shaders, LsfgResources& resources,
-                     vk::DescriptorPool& descriptor_pool, LsfgImageHistory& inputs_,
-                     LsfgImage& flow_input_, LsfgImage* previous_)
-    : inputs{&inputs_}, flow_input{&flow_input_}, previous{previous_} {
-    using namespace VideoCore::FrameGen::PerformanceShader;
-
-    passes[0] = LsfgPass(device, shaders, GAMMA[0],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {5, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {3, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[1] = LsfgPass(device, shaders, GAMMA[1],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {3, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[2] = LsfgPass(device, shaders, GAMMA[2],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[3] = LsfgPass(device, shaders, GAMMA[3],
-                         {{1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {2, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-    passes[4] = LsfgPass(device, shaders, GAMMA[4],
-                         {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                          {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                          {4, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                          {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-
-    const VkExtent2D extent = (*inputs)[0][0].Extent();
-    for (auto& image : temp1) {
-        image = LsfgImage(device, memory_allocator, extent);
-    }
-    for (auto& image : temp2) {
-        image = LsfgImage(device, memory_allocator, extent);
-    }
-    out_image = LsfgImage(device, memory_allocator, extent, LSFG_MOTION_FORMAT);
-
-    std::vector<VkDescriptorSetLayout> layouts;
-    for (size_t slot = 0; slot < LSFG_GENERATION_SLOTS; ++slot) {
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            layouts.push_back(passes[0].SetLayout());
-        }
-        for (size_t i = 1; i < LSFG_GAMMA_STAGES; ++i) {
-            layouts.push_back(passes[i].SetLayout());
-        }
-    }
-    owned_sets = CreateWrappedDescriptorSets(descriptor_pool, layouts);
-
-    const VkSampler sampler = resources.GetSampler();
-    const VkSampler border_sampler = resources.GetSampler(
-        VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER, VK_COMPARE_OP_NEVER, true);
-    const VkSampler edge_sampler =
-        resources.GetSampler(VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VK_COMPARE_OP_ALWAYS, false);
-
-    size_t next = 0;
-    for (size_t slot = 0; slot < LSFG_GENERATION_SLOTS; ++slot) {
-        Generation& pass = generations[slot];
-        const VkBuffer buffer =
-            resources.GetBuffer(LsfgSlotTimestamp(slot), previous == nullptr);
-
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            pass.first_descriptor_sets[i] = owned_sets[next++];
-        }
-        for (size_t i = 0; i < LSFG_GAMMA_STAGES - 1; ++i) {
-            pass.descriptor_sets[i] = owned_sets[next++];
-        }
-
-        for (size_t i = 0; i < LSFG_HISTORY_SLOTS; ++i) {
-            LsfgDescriptorWriter(pass.first_descriptor_sets[i])
-                .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-                .AddSampler(border_sampler)
-                .AddSampler(edge_sampler)
-                .AddSampledImages((*inputs)[(i + 2) % LSFG_HISTORY_SLOTS])
-                .AddSampledImages((*inputs)[i % LSFG_HISTORY_SLOTS])
-                .AddSampledImage(previous)
-                .AddStorageImages(temp1)
-                .Build(device);
-        }
-        LsfgDescriptorWriter(pass.descriptor_sets[0])
-            .AddSampler(sampler)
-            .AddSampledImages(temp1)
-            .AddStorageImages(temp2)
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[1])
-            .AddSampler(sampler)
-            .AddSampledImages(temp2)
-            .AddStorageImage(temp1[0])
-            .AddStorageImage(temp1[1])
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[2])
-            .AddSampler(sampler)
-            .AddSampledImage(temp1[0])
-            .AddSampledImage(temp1[1])
-            .AddStorageImages(temp2)
-            .Build(device);
-        LsfgDescriptorWriter(pass.descriptor_sets[3])
-            .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-            .AddSampler(sampler)
-            .AddSampler(edge_sampler)
-            .AddSampledImages(temp2)
-            .AddSampledImage(previous)
-            .AddSampledImage(*flow_input)
-            .AddStorageImage(out_image)
-            .Build(device);
-    }
-}
-
-void LsfgGamma::Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count, size_t slot) {
-    const Generation& pass = generations[slot];
-
-    const VkExtent2D extent = temp1[0].Extent();
-    const u32 groups_x = GroupCount(extent.width);
-    const u32 groups_y = GroupCount(extent.height);
-
-    const size_t history = frame_count % LSFG_HISTORY_SLOTS;
-    const size_t previous_history = (frame_count + 2) % LSFG_HISTORY_SLOTS;
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll((*inputs)[previous_history])
-        .WriteToReadAll((*inputs)[history])
-        .WriteToRead(previous)
-        .ReadToWriteAll(temp1)
-        .Build();
-    passes[0].Bind(cmdbuf, pass.first_descriptor_sets[history]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf).WriteToReadAll(temp1).ReadToWriteAll(temp2).Build();
-    passes[1].Bind(cmdbuf, pass.descriptor_sets[0]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll(temp2)
-        .ReadToWrite(temp1[0])
-        .ReadToWrite(temp1[1])
-        .Build();
-    passes[2].Bind(cmdbuf, pass.descriptor_sets[1]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToRead(temp1[0])
-        .WriteToRead(temp1[1])
-        .ReadToWriteAll(temp2)
-        .Build();
-    passes[3].Bind(cmdbuf, pass.descriptor_sets[2]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll(temp2)
-        .WriteToRead(previous)
-        .WriteToRead(*flow_input)
-        .ReadToWrite(out_image)
-        .Build();
-    passes[4].Bind(cmdbuf, pass.descriptor_sets[3]);
-    cmdbuf.Dispatch(groups_x, groups_y, 1);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_gamma.h

@@ -1,54 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr size_t LSFG_GAMMA_STAGES = 5;
-constexpr size_t LSFG_GAMMA_TEMPS = 3;
-
-class LsfgGamma {
-public:
-    LsfgGamma() = default;
-    LsfgGamma(const Device& device, MemoryAllocator& memory_allocator, const LsfgShaders& shaders,
-              LsfgResources& resources, vk::DescriptorPool& descriptor_pool,
-              LsfgImageHistory& inputs, LsfgImage& flow_input, LsfgImage* previous);
-
-    void Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count, size_t slot);
-
-    [[nodiscard]] LsfgImage& Output() {
-        return out_image;
-    }
-
-private:
-    struct Generation {
-        std::array<VkDescriptorSet, LSFG_HISTORY_SLOTS> first_descriptor_sets{};
-        std::array<VkDescriptorSet, LSFG_GAMMA_STAGES - 1> descriptor_sets{};
-    };
-
-    LsfgImageHistory* inputs{};
-    LsfgImage* flow_input{};
-    LsfgImage* previous{};
-
-    std::array<LsfgPass, LSFG_GAMMA_STAGES> passes;
-    std::array<Generation, LSFG_GENERATION_SLOTS> generations{};
-    vk::DescriptorSets owned_sets;
-
-    std::array<LsfgImage, LSFG_GAMMA_TEMPS> temp1;
-    LsfgImagePair temp2;
-    LsfgImage out_image;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_generate.cpp

@@ -1,130 +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
-
-#include <vector>
-
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_generate.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DISPATCH_TILE_SHIFT = 4;
-
-[[nodiscard]] u32 GroupCount(u32 size) {
-    return (size + (1u << DISPATCH_TILE_SHIFT) - 1) >> DISPATCH_TILE_SHIFT;
-}
-
-VkImageMemoryBarrier MakeTargetBarrier(VkImage image, VkAccessFlags src_access,
-                                       VkAccessFlags dst_access, VkImageLayout old_layout) {
-    return VkImageMemoryBarrier{
-        .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
-        .pNext = nullptr,
-        .srcAccessMask = src_access,
-        .dstAccessMask = dst_access,
-        .oldLayout = old_layout,
-        .newLayout = VK_IMAGE_LAYOUT_GENERAL,
-        .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
-        .image = image,
-        .subresourceRange{
-            .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-            .baseMipLevel = 0,
-            .levelCount = 1,
-            .baseArrayLayer = 0,
-            .layerCount = 1,
-        },
-    };
-}
-
-} // Anonymous namespace
-
-LsfgGenerate::LsfgGenerate(const Device& device, const LsfgShaders& shaders,
-                           LsfgResources& resources, vk::DescriptorPool& descriptor_pool,
-                           LsfgImagePair& frames_, LsfgImage& motion_, LsfgImage& detail1_,
-                           LsfgImage& detail2_)
-    : frames{&frames_}, motion{&motion_}, detail1{&detail1_}, detail2{&detail2_} {
-    using namespace VideoCore::FrameGen::PerformanceShader;
-
-    pass = LsfgPass(device, shaders, GENERATE,
-                    {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                     {2, VK_DESCRIPTOR_TYPE_SAMPLER},
-                     {5, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                     {1, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-
-    sampler = resources.GetSampler();
-    edge_sampler =
-        resources.GetSampler(VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VK_COMPARE_OP_ALWAYS, false);
-
-    const std::vector<VkDescriptorSetLayout> layouts(
-        LSFG_GENERATION_SLOTS * LSFG_MAX_TARGETS * 2, pass.SetLayout());
-    owned_sets = CreateWrappedDescriptorSets(descriptor_pool, layouts);
-
-    size_t next = 0;
-    for (size_t slot = 0; slot < LSFG_GENERATION_SLOTS; ++slot) {
-        Generation& target = generations[slot];
-        target.buffer = resources.GetBuffer(LsfgSlotTimestamp(slot));
-
-        for (auto& entry : target.targets) {
-            for (auto& set : entry.descriptor_sets) {
-                set = owned_sets[next++];
-            }
-        }
-    }
-}
-
-void LsfgGenerate::SetTarget(const Device& device, size_t slot, u32 target, VkImageView view) {
-    Target& entry = generations[slot].targets[target];
-    if (entry.view == view) {
-        return;
-    }
-    entry.view = view;
-
-    for (size_t i = 0; i < entry.descriptor_sets.size(); ++i) {
-        LsfgDescriptorWriter(entry.descriptor_sets[i])
-            .AddUniformBuffer(generations[slot].buffer, LsfgResources::BufferSize())
-            .AddSampler(sampler)
-            .AddSampler(edge_sampler)
-            .AddSampledImage((*frames)[1 - i])
-            .AddSampledImage((*frames)[i])
-            .AddSampledImage(*motion)
-            .AddSampledImage(*detail1)
-            .AddSampledImage(*detail2)
-            .AddStorageView(view)
-            .Build(device);
-    }
-}
-
-void LsfgGenerate::Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count, size_t slot, u32 target,
-                            VkImage image, VkExtent2D extent) {
-    const Target& entry = generations[slot].targets[target];
-
-    LsfgBarriers(cmdbuf)
-        .WriteToReadAll(*frames)
-        .WriteToRead(*motion)
-        .WriteToRead(*detail1)
-        .WriteToRead(*detail2)
-        .DiscardToWrite(image)
-        .Build();
-
-    pass.Bind(cmdbuf, entry.descriptor_sets[frame_count % entry.descriptor_sets.size()]);
-    cmdbuf.Dispatch(GroupCount(extent.width), GroupCount(extent.height), 1);
-
-    const std::array after{MakeTargetBarrier(
-        image, VK_ACCESS_SHADER_WRITE_BIT,
-        VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_TRANSFER_READ_BIT,
-        VK_IMAGE_LAYOUT_GENERAL)};
-    cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-                           VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                               VK_PIPELINE_STAGE_TRANSFER_BIT,
-                           0, {}, {}, after);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_generate.h

@@ -1,54 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-class LsfgGenerate {
-public:
-    LsfgGenerate() = default;
-    LsfgGenerate(const Device& device, const LsfgShaders& shaders, LsfgResources& resources,
-                 vk::DescriptorPool& descriptor_pool, LsfgImagePair& frames, LsfgImage& motion,
-                 LsfgImage& detail1, LsfgImage& detail2);
-
-    void SetTarget(const Device& device, size_t slot, u32 target, VkImageView view);
-
-    void Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count, size_t slot, u32 target,
-                  VkImage image, VkExtent2D extent);
-
-private:
-    struct Target {
-        std::array<VkDescriptorSet, 2> descriptor_sets{};
-        VkImageView view{};
-    };
-
-    struct Generation {
-        std::array<Target, LSFG_MAX_TARGETS> targets{};
-        VkBuffer buffer{};
-    };
-
-    LsfgImagePair* frames{};
-    LsfgImage* motion{};
-    LsfgImage* detail1{};
-    LsfgImage* detail2{};
-    VkSampler sampler{};
-    VkSampler edge_sampler{};
-
-    LsfgPass pass;
-    std::array<Generation, LSFG_GENERATION_SLOTS> generations{};
-    vk::DescriptorSets owned_sets;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_mipmaps.cpp

@@ -1,81 +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
-
-#include <algorithm>
-#include <vector>
-
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_mipmaps.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-namespace {
-
-constexpr u32 DISPATCH_TILE_SHIFT = 6;
-
-[[nodiscard]] u32 GroupCount(u32 size) {
-    return (size + (1u << DISPATCH_TILE_SHIFT) - 1) >> DISPATCH_TILE_SHIFT;
-}
-
-} // Anonymous namespace
-
-LsfgMipmaps::LsfgMipmaps(const Device& device, MemoryAllocator& memory_allocator,
-                         const LsfgShaders& shaders, LsfgResources& resources,
-                         vk::DescriptorPool& descriptor_pool, LsfgImagePair& frames_,
-                         f32 flow_scale)
-    : frames{&frames_} {
-    using namespace VideoCore::FrameGen::PerformanceShader;
-
-    pass = LsfgPass(device, shaders, MIPMAPS,
-                    {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER},
-                     {1, VK_DESCRIPTOR_TYPE_SAMPLER},
-                     {1, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE},
-                     {LSFG_MIP_LEVELS, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE}});
-
-    const VkExtent2D input_extent = (*frames)[0].Extent();
-    flow_extent = VkExtent2D{
-        .width = std::max(1u, static_cast<u32>(static_cast<f32>(input_extent.width) * flow_scale)),
-        .height = std::max(1u, static_cast<u32>(static_cast<f32>(input_extent.height) * flow_scale)),
-    };
-
-    for (size_t i = 0; i < LSFG_MIP_LEVELS; ++i) {
-        const VkExtent2D level_extent{
-            .width = flow_extent.width >> i,
-            .height = flow_extent.height >> i,
-        };
-        out_images[i] = LsfgImage(device, memory_allocator, level_extent, LSFG_FLOW_FORMAT);
-    }
-
-    const std::vector<VkDescriptorSetLayout> layouts(descriptor_sets.size(), pass.SetLayout());
-    owned_sets = CreateWrappedDescriptorSets(descriptor_pool, layouts);
-
-    const VkSampler sampler = resources.GetSampler();
-    const VkBuffer buffer = resources.GetBuffer();
-
-    for (size_t i = 0; i < descriptor_sets.size(); ++i) {
-        descriptor_sets[i] = owned_sets[i];
-        LsfgDescriptorWriter(descriptor_sets[i])
-            .AddUniformBuffer(buffer, LsfgResources::BufferSize())
-            .AddSampler(sampler)
-            .AddSampledImage((*frames)[i])
-            .AddStorageImages(out_images)
-            .Build(device);
-    }
-}
-
-void LsfgMipmaps::Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count) {
-    const size_t slot = frame_count % descriptor_sets.size();
-
-    LsfgBarriers(cmdbuf).WriteToRead((*frames)[slot]).ReadToWriteAll(out_images).Build();
-
-    pass.Bind(cmdbuf, descriptor_sets[slot]);
-    cmdbuf.Dispatch(GroupCount(flow_extent.width), GroupCount(flow_extent.height), 1);
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_mipmaps.h

@@ -1,45 +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 "common/common_types.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
-
-namespace Vulkan {
-
-class Device;
-class LsfgShaders;
-
-constexpr size_t LSFG_MIP_LEVELS = 7;
-
-class LsfgMipmaps {
-public:
-    LsfgMipmaps() = default;
-    LsfgMipmaps(const Device& device, MemoryAllocator& memory_allocator, const LsfgShaders& shaders,
-                LsfgResources& resources, vk::DescriptorPool& descriptor_pool,
-                LsfgImagePair& frames, f32 flow_scale);
-
-    void Dispatch(vk::CommandBuffer cmdbuf, u64 frame_count);
-
-    [[nodiscard]] LsfgImage& Output(size_t level) {
-        return out_images[level];
-    }
-
-private:
-    LsfgImagePair* frames{};
-
-    LsfgPass pass;
-    std::array<VkDescriptorSet, 2> descriptor_sets{};
-    vk::DescriptorSets owned_sets;
-
-    VkExtent2D flow_extent{};
-    std::array<LsfgImage, LSFG_MIP_LEVELS> out_images;
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_shaders.cpp

@@ -1,37 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "common/settings.h"
-#include "video_core/frame_gen/lossless_dll.h"
-#include "video_core/renderer_vulkan/present/lsfg_shaders.h"
-#include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
-
-namespace Vulkan {
-
-LsfgShaders::LsfgShaders(const Device& device) {
-    if (!device.IsVulkanMemoryModelSupported() || !device.HasNullDescriptor()) {
-        return;
-    }
-
-    const bool prefer_fp16 =
-        Settings::values.frame_gen_fp16.GetValue() && device.IsFloat16Supported();
-
-    VideoCore::FrameGen::ShaderModules code;
-    if (VideoCore::FrameGen::LoadShaderModules(code, prefer_fp16) !=
-        VideoCore::FrameGen::LosslessStatus::Ok) {
-        return;
-    }
-
-    for (const auto& [id, words] : code) {
-        modules.emplace(id, CreateWrappedShaderModule(device, words));
-    }
-    valid = true;
-}
-
-VkShaderModule LsfgShaders::Get(u32 shader_id) const {
-    const auto hit = modules.find(shader_id);
-    return hit == modules.end() ? VK_NULL_HANDLE : *hit->second;
-}
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/lsfg_shaders.h

@@ -1,30 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <map>
-
-#include "common/common_types.h"
-#include "video_core/vulkan_common/vulkan_wrapper.h"
-
-namespace Vulkan {
-
-class Device;
-
-class LsfgShaders {
-public:
-    explicit LsfgShaders(const Device& device);
-
-    [[nodiscard]] bool IsValid() const {
-        return valid;
-    }
-
-    [[nodiscard]] VkShaderModule Get(u32 shader_id) const;
-
-private:
-    std::map<u32, vk::ShaderModule> modules;
-    bool valid{};
-};
-
-} // namespace Vulkan

src/video_core/renderer_vulkan/present/sgsr.cpp

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#include <algorithm>
+
 #include "common/common_types.h"
 #include "common/div_ceil.h"
 #include "common/settings.h"
@@ -17,7 +19,7 @@
 
 namespace Vulkan {
 
-using PushConstants = std::array<u32, 4 + 2 + 1>;
+using PushConstants = std::array<u32, 4 + 2 + 2 + 1>;
 
 SGSR::SGSR(const Device& device, MemoryAllocator& memory_allocator, size_t image_count, VkExtent2D extent, bool edge_dir)
     : m_memory_allocator{memory_allocator}
@@ -100,26 +102,28 @@ VkImageView SGSR::Draw(const Device& device, Scheduler& scheduler, size_t image_
 
     const f32 input_image_width = f32(input_image_extent.width);
     const f32 input_image_height = f32(input_image_extent.height);
-    const f32 viewport_width = (crop_rect.right - crop_rect.left) * input_image_width;
-    const f32 viewport_height = (crop_rect.bottom - crop_rect.top) * input_image_height;
-    // expected [0, 2]
-    const f32 sharpening = f32(Settings::values.fsr_sharpening_slider.GetValue()) / 100.0f;
+    const f32 crop_width = (crop_rect.right - crop_rect.left) * input_image_width;
+    const f32 crop_height = (crop_rect.bottom - crop_rect.top) * input_image_height;
+    static constexpr f32 EDGE_SHARPNESS_MAX = 2.0f;
+    const f32 edge_sharpness =
+        EDGE_SHARPNESS_MAX - f32(Settings::values.fsr_sharpening_slider.GetValue()) / 200.0f;
 
-    // p = (tex * viewport) / input = [0,n] (normalized texcoords)
-    // p * input = [0,1024], [0,768]
     // layout( push_constant ) uniform constants {
     //     highp vec4 ViewportInfo[1];
     //     highp vec2 ResizeFactor;
+    //     highp vec2 CropOffset;
     //     highp float EdgeSharpness;
     // };
     PushConstants viewport_con{};
-    viewport_con[0] = std::bit_cast<u32>(std::abs(1.f / viewport_width));
-    viewport_con[1] = std::bit_cast<u32>(std::abs(1.f / viewport_height));
-    viewport_con[2] = std::bit_cast<u32>(std::abs(viewport_width));
-    viewport_con[3] = std::bit_cast<u32>(std::abs(viewport_height));
-    viewport_con[4] = std::bit_cast<u32>(viewport_width / input_image_width);
-    viewport_con[5] = std::bit_cast<u32>(viewport_height / input_image_height);
-    viewport_con[6] = std::bit_cast<u32>(sharpening);
+    viewport_con[0] = std::bit_cast<u32>(1.f / input_image_width);
+    viewport_con[1] = std::bit_cast<u32>(1.f / input_image_height);
+    viewport_con[2] = std::bit_cast<u32>(input_image_width);
+    viewport_con[3] = std::bit_cast<u32>(input_image_height);
+    viewport_con[4] = std::bit_cast<u32>(crop_width / input_image_width);
+    viewport_con[5] = std::bit_cast<u32>(crop_height / input_image_height);
+    viewport_con[6] = std::bit_cast<u32>((std::min)(crop_rect.left, crop_rect.right));
+    viewport_con[7] = std::bit_cast<u32>((std::min)(crop_rect.top, crop_rect.bottom));
+    viewport_con[8] = std::bit_cast<u32>(edge_sharpness);
 
     UploadImages(device, scheduler);
     UpdateDescriptorSets(device, source_image_view, image_index);

src/video_core/renderer_vulkan/present/util.cpp

@@ -320,16 +320,15 @@ vk::DescriptorPool CreateWrappedDescriptorPool(const Device& device, size_t max_
     });
 }
 
-vk::DescriptorSetLayout CreateWrappedDescriptorSetLayout(const Device& device,
-                                                         std::span<const VkDescriptorType> types,
-                                                         VkShaderStageFlags stages) {
+vk::DescriptorSetLayout CreateWrappedDescriptorSetLayout(
+    const Device& device, std::initializer_list<VkDescriptorType> types) {
     std::vector<VkDescriptorSetLayoutBinding> bindings(types.size());
     for (size_t i = 0; i < types.size(); i++) {
         bindings[i] = {
             .binding = static_cast<u32>(i),
-            .descriptorType = types[i],
+            .descriptorType = std::data(types)[i],
             .descriptorCount = 1,
-            .stageFlags = stages,
+            .stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
             .pImmutableSamplers = nullptr,
         };
     }
@@ -343,13 +342,6 @@ vk::DescriptorSetLayout CreateWrappedDescriptorSetLayout(const Device& device,
     });
 }
 
-vk::DescriptorSetLayout CreateWrappedDescriptorSetLayout(
-    const Device& device, std::initializer_list<VkDescriptorType> types,
-    VkShaderStageFlags stages) {
-    return CreateWrappedDescriptorSetLayout(
-        device, std::span<const VkDescriptorType>{std::data(types), types.size()}, stages);
-}
-
 vk::DescriptorSets CreateWrappedDescriptorSets(vk::DescriptorPool& pool,
                                                vk::Span<VkDescriptorSetLayout> layouts) {
     return pool.Allocate(VkDescriptorSetAllocateInfo{
@@ -361,28 +353,6 @@ vk::DescriptorSets CreateWrappedDescriptorSets(vk::DescriptorPool& pool,
     });
 }
 
-vk::Pipeline CreateWrappedComputePipeline(const Device& device, vk::PipelineLayout& layout,
-                                          VkShaderModule shader) {
-    return device.GetLogical().CreateComputePipeline(VkComputePipelineCreateInfo{
-        .sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO,
-        .pNext = nullptr,
-        .flags = 0,
-        .stage =
-            {
-                .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
-                .pNext = nullptr,
-                .flags = 0,
-                .stage = VK_SHADER_STAGE_COMPUTE_BIT,
-                .module = shader,
-                .pName = "main",
-                .pSpecializationInfo = nullptr,
-            },
-        .layout = *layout,
-        .basePipelineHandle = VK_NULL_HANDLE,
-        .basePipelineIndex = 0,
-    });
-}
-
 vk::PipelineLayout CreateWrappedPipelineLayout(const Device& device,
                                                vk::DescriptorSetLayout& layout) {
     return device.GetLogical().CreatePipelineLayout(VkPipelineLayoutCreateInfo{
@@ -521,7 +491,7 @@ static vk::Pipeline CreateWrappedPipelineImpl(
         .subpass = 0,
         .basePipelineHandle = 0,
         .basePipelineIndex = 0,
-    });
+    }, device.StaticPipelineCache());
 }
 
 vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderpass,

src/video_core/renderer_vulkan/present/util.h

@@ -38,11 +38,7 @@ vk::DescriptorPool CreateWrappedDescriptorPool(const Device& device, size_t max_
                                                std::initializer_list<VkDescriptorType> types = {
                                                    VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER});
 vk::DescriptorSetLayout CreateWrappedDescriptorSetLayout(
-    const Device& device, std::initializer_list<VkDescriptorType> types,
-    VkShaderStageFlags stages = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT);
-vk::DescriptorSetLayout CreateWrappedDescriptorSetLayout(const Device& device,
-                                                         std::span<const VkDescriptorType> types,
-                                                         VkShaderStageFlags stages);
+    const Device& device, std::initializer_list<VkDescriptorType> types);
 vk::DescriptorSets CreateWrappedDescriptorSets(vk::DescriptorPool& pool,
                                                vk::Span<VkDescriptorSetLayout> layouts);
 vk::PipelineLayout CreateWrappedPipelineLayout(const Device& device,
@@ -50,8 +46,6 @@ vk::PipelineLayout CreateWrappedPipelineLayout(const Device& device,
 vk::Pipeline CreateWrappedPipeline(const Device& device, vk::RenderPass& renderpass,
                                    vk::PipelineLayout& layout,
                                    std::tuple<vk::ShaderModule&, vk::ShaderModule&> shaders);
-vk::Pipeline CreateWrappedComputePipeline(const Device& device, vk::PipelineLayout& layout,
-                                          VkShaderModule shader);
 vk::Pipeline CreateWrappedPremultipliedBlendingPipeline(
     const Device& device, vk::RenderPass& renderpass, vk::PipelineLayout& layout,
     std::tuple<vk::ShaderModule&, vk::ShaderModule&> shaders);

src/video_core/renderer_vulkan/renderer_vulkan.cpp

@@ -49,21 +49,6 @@ constexpr VkExtent2D CaptureImageSize{
     .height = VideoCore::Capture::LinearHeight,
 };
 
-[[nodiscard]] VkExtent2D GuestExtent(std::span<const Tegra::FramebufferConfig> framebuffers) {
-    if (framebuffers.empty()) {
-        return VkExtent2D{};
-    }
-
-    const auto& framebuffer = framebuffers.front();
-    if (framebuffer.crop_rect.IsEmpty()) {
-        return VkExtent2D{.width = framebuffer.width, .height = framebuffer.height};
-    }
-    return VkExtent2D{
-        .width = static_cast<u32>(framebuffer.crop_rect.GetWidth()),
-        .height = static_cast<u32>(framebuffer.crop_rect.GetHeight()),
-    };
-}
-
 constexpr VkExtent3D CaptureImageExtent{
     .width = VideoCore::Capture::LinearWidth,
     .height = VideoCore::Capture::LinearHeight,
@@ -170,8 +155,7 @@ try
                   present_manager,
                   scheduler,
                   PresentFiltersForAppletCapture)
-    , rasterizer(render_window, gpu, device_memory, device, memory_allocator, state_tracker, scheduler)
-    , frame_gen(memory_allocator, scheduler) {
+    , rasterizer(render_window, gpu, device_memory, device, memory_allocator, state_tracker, scheduler) {
 
     if (Settings::values.renderer_force_max_clock.GetValue() && device.ShouldBoostClocks()) {
         turbo_mode.emplace(instance, dld);
@@ -207,24 +191,9 @@ void RendererVulkan::Composite(std::span<const Tegra::FramebufferConfig> framebu
     blit_swapchain.DrawToFrame(device, rasterizer, frame, framebuffers,
                                render_window.GetFramebufferLayout(), swapchain.GetImageCount(),
                                swapchain.GetImageViewFormat());
-
-    void(frame_gen.WantedGenerations(present_manager.MaxExtraFrames()));
-
-    frame_gen.Process(device, frame, swapchain.GetImageFormat(), GuestExtent(framebuffers));
-
-    const size_t generated_frames = frame_gen.GeneratedFrameCount();
-    for (size_t generation = 0; generation < generated_frames; ++generation) {
-        Frame* generated = present_manager.GetRenderFrame();
-        blit_swapchain.PrepareFrame(device, generated, render_window.GetFramebufferLayout());
-        frame_gen.GenerateInto(device, generated, generation);
-        scheduler.Flush(*generated->render_ready);
-        present_manager.Present(generated);
-    }
-
     scheduler.Flush(*frame->render_ready);
 
     present_manager.Present(frame);
-    scheduler.DispatchWork();
 
     gpu.RendererFrameEndNotify();
     rasterizer.TickFrame();

src/video_core/renderer_vulkan/renderer_vulkan.h

@@ -13,7 +13,6 @@
 #include "common/dynamic_library.h"
 #include "video_core/host1x/gpu_device_memory_manager.h"
 #include "video_core/renderer_base.h"
-#include "video_core/renderer_vulkan/present/frame_gen.h"
 #include "video_core/renderer_vulkan/vk_blit_screen.h"
 #include "video_core/renderer_vulkan/vk_present_manager.h"
 #include "video_core/renderer_vulkan/vk_rasterizer.h"
@@ -96,7 +95,6 @@ private:
     BlitScreen blit_capture;
     BlitScreen blit_applet;
     RasterizerVulkan rasterizer;
-    FrameGen frame_gen;
     std::optional<TurboMode> turbo_mode;
 
     Frame applet_frame;

src/video_core/renderer_vulkan/vk_blit_screen.cpp

@@ -85,17 +85,6 @@ void BlitScreen::SetWindowAdaptPass(const Device& device) {
     }
 }
 
-void BlitScreen::PrepareFrame(const Device& device, Frame* frame,
-                              const Layout::FramebufferLayout& layout) {
-    if (!window_adapt || (frame->width == layout.width && frame->height == layout.height)) {
-        return;
-    }
-
-    WaitIdle(device);
-    present_manager.RecreateFrame(frame, layout.width, layout.height, swapchain_view_format,
-                                  window_adapt->GetRenderPass());
-}
-
 void BlitScreen::DrawToFrame(const Device& device, RasterizerVulkan& rasterizer, Frame* frame,
                              std::span<const Tegra::FramebufferConfig> framebuffers,
                              const Layout::FramebufferLayout& layout,

src/video_core/renderer_vulkan/vk_blit_screen.h

@@ -60,8 +60,6 @@ public:
                      const Layout::FramebufferLayout& layout, size_t current_swapchain_image_count,
                      VkFormat current_swapchain_view_format);
 
-    void PrepareFrame(const Device& device, Frame* frame, const Layout::FramebufferLayout& layout);
-
     [[nodiscard]] vk::Framebuffer CreateFramebuffer(const Device& device, const Layout::FramebufferLayout& layout,
                                                     VkImageView image_view,
                                                     VkFormat current_view_format);

src/video_core/renderer_vulkan/vk_compute_pass.cpp

@@ -22,7 +22,9 @@
 #include "video_core/host_shaders/resolve_conditional_render_comp_spv.h"
 #include "video_core/host_shaders/vulkan_quad_indexed_comp_spv.h"
 #include "video_core/host_shaders/vulkan_uint8_comp_spv.h"
+#include "video_core/host_shaders/block_linear_unswizzle_2d_buffer_comp_spv.h"
 #include "video_core/host_shaders/block_linear_unswizzle_3d_bcn_comp_spv.h"
+#include "video_core/host_shaders/block_linear_unswizzle_3d_buffer_comp_spv.h"
 #include "video_core/renderer_vulkan/vk_compute_pass.h"
 #include "video_core/surface.h"
 #include "video_core/renderer_vulkan/vk_descriptor_pool.h"
@@ -268,7 +270,7 @@ ComputePass::ComputePass(const Device& device_, Scheduler& scheduler, Descriptor
         .layout = *layout,
         .basePipelineHandle = {},
         .basePipelineIndex = 0,
-    });
+    }, device.StaticPipelineCache());
 }
 
 ComputePass::~ComputePass() = default;
@@ -872,4 +874,479 @@ void BlockLinearUnswizzle3DPass::UnswizzleChunk(
     });
 }
 
+namespace {
+constexpr u32 BL2D_BINDING_INPUT_BUFFER = 0;
+constexpr u32 BL2D_BINDING_OUTPUT_BUFFER = 1;
+
+struct alignas(16) BlockLinearUnswizzle2DPushConstants {
+    std::array<u32, 3> dim;
+    u32 bytes_per_block_log2;
+    std::array<u32, 3> origin;
+    u32 layer_stride;
+    u32 block_size;
+    u32 x_shift;
+    u32 block_height;
+    u32 block_height_mask;
+};
+static_assert(sizeof(BlockLinearUnswizzle2DPushConstants) <= 128);
+
+constexpr std::array<VkDescriptorSetLayoutBinding, 2> BL2D_BINDINGS{{
+    {
+        .binding = BL2D_BINDING_INPUT_BUFFER,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .descriptorCount = 1,
+        .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
+        .pImmutableSamplers = nullptr,
+    },
+    {
+        .binding = BL2D_BINDING_OUTPUT_BUFFER,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .descriptorCount = 1,
+        .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
+        .pImmutableSamplers = nullptr,
+    },
+}};
+
+constexpr std::array<VkDescriptorUpdateTemplateEntry, 2> BL2D_TEMPLATE{{
+    {
+        .dstBinding = BL2D_BINDING_INPUT_BUFFER,
+        .dstArrayElement = 0,
+        .descriptorCount = 1,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .offset = BL2D_BINDING_INPUT_BUFFER * sizeof(DescriptorUpdateEntry),
+        .stride = sizeof(DescriptorUpdateEntry),
+    },
+    {
+        .dstBinding = BL2D_BINDING_OUTPUT_BUFFER,
+        .dstArrayElement = 0,
+        .descriptorCount = 1,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .offset = BL2D_BINDING_OUTPUT_BUFFER * sizeof(DescriptorUpdateEntry),
+        .stride = sizeof(DescriptorUpdateEntry),
+    },
+}};
+
+constexpr DescriptorBankInfo BL2D_BANK_INFO{
+    .uniform_buffers = 0,
+    .storage_buffers = 2,
+    .texture_buffers = 0,
+    .image_buffers = 0,
+    .textures = 0,
+    .images = 0,
+    .score = 2,
+};
+} // Anonymous namespace
+
+BlockLinearUnswizzle2DPass::BlockLinearUnswizzle2DPass(
+    const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_,
+    StagingBufferPool& staging_buffer_pool_,
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue_)
+    : ComputePass(device_, scheduler_, descriptor_pool_, BL2D_BINDINGS, BL2D_TEMPLATE,
+                  BL2D_BANK_INFO,
+                  COMPUTE_PUSH_CONSTANT_RANGE<sizeof(BlockLinearUnswizzle2DPushConstants)>,
+                  BLOCK_LINEAR_UNSWIZZLE_2D_BUFFER_COMP_SPV),
+      scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_},
+      compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {}
+
+BlockLinearUnswizzle2DPass::~BlockLinearUnswizzle2DPass() = default;
+
+bool BlockLinearUnswizzle2DPass::IsSupported(const VideoCommon::ImageInfo& info) {
+    if (info.type != VideoCommon::ImageType::e2D) {
+        return false;
+    }
+    if (info.resources.levels != 1 || info.resources.layers != 1) {
+        return false;
+    }
+    if (info.num_samples > 1) {
+        return false;
+    }
+    if (VideoCore::Surface::IsPixelFormatASTC(info.format) ||
+        VideoCore::Surface::IsPixelFormatBCn(info.format)) {
+        return false;
+    }
+    const u32 bytes_per_block = VideoCore::Surface::BytesPerBlock(info.format);
+    if (bytes_per_block != 4 && bytes_per_block != 8 && bytes_per_block != 16) {
+        return false;
+    }
+    return VideoCore::Surface::DefaultBlockWidth(info.format) == 1 &&
+           VideoCore::Surface::DefaultBlockHeight(info.format) == 1;
+}
+
+void BlockLinearUnswizzle2DPass::Unswizzle(
+    Image& image, const StagingBufferRef& swizzled,
+    std::span<const VideoCommon::SwizzleParameters> swizzles) {
+    if (swizzles.empty()) {
+        return;
+    }
+    const VideoCommon::SwizzleParameters& sw = swizzles.front();
+    const auto params = VideoCommon::Accelerated::MakeBlockLinearSwizzle2DParams(sw, image.info);
+
+    const u32 width = sw.num_tiles.width;
+    const u32 height = sw.num_tiles.height;
+    const u32 depth = image.info.resources.layers;
+    const u32 bytes_per_block = 1u << params.bytes_per_block_log2;
+    const VkDeviceSize output_size =
+        static_cast<VkDeviceSize>(width) * height * depth * bytes_per_block;
+
+    const StagingBufferRef output =
+        staging_buffer_pool.Request(static_cast<size_t>(output_size), MemoryUsage::DeviceLocal);
+
+    BlockLinearUnswizzle2DPushConstants pc{};
+    pc.dim = {width, height, depth};
+    pc.bytes_per_block_log2 = params.bytes_per_block_log2;
+    pc.origin = params.origin;
+    pc.layer_stride = params.layer_stride;
+    pc.block_size = params.block_size;
+    pc.x_shift = params.x_shift;
+    pc.block_height = params.block_height;
+    pc.block_height_mask = params.block_height_mask;
+
+    scheduler.RequestOutsideRenderPassOperationContext();
+
+    compute_pass_descriptor_queue.Acquire(scheduler, 2);
+    compute_pass_descriptor_queue.AddBuffer(swizzled.buffer, sw.buffer_offset + swizzled.offset,
+                                            image.guest_size_bytes - sw.buffer_offset);
+    compute_pass_descriptor_queue.AddBuffer(output.buffer, output.offset, output_size);
+
+    const void* descriptor_data = compute_pass_descriptor_queue.UpdateData();
+    const VkDescriptorSet set = descriptor_allocator.Commit();
+
+    const u32 gx = Common::DivCeil(width, 16u);
+    const u32 gy = Common::DivCeil(height, 8u);
+    const bool is_initialized = image.ExchangeInitialization();
+
+    const VkBuffer out_buffer = output.buffer;
+    const VkDeviceSize out_offset = output.offset;
+    const VkImage dst_image = image.Handle();
+    const VkImageAspectFlags aspect = image.AspectMask();
+
+    scheduler.Record([this, set, descriptor_data, pc, gx, gy, depth, output_size, out_buffer,
+                      out_offset, dst_image, aspect, width, height,
+                      is_initialized](vk::CommandBuffer cmdbuf) {
+        if (dst_image == VK_NULL_HANDLE || out_buffer == VK_NULL_HANDLE) {
+            return;
+        }
+        device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);
+        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
+        cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(pc), &pc);
+        cmdbuf.Dispatch(gx, gy, depth);
+
+        const VkBufferMemoryBarrier buffer_barrier{
+            .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .buffer = out_buffer,
+            .offset = out_offset,
+            .size = output_size,
+        };
+        const VkImageMemoryBarrier pre_copy{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = static_cast<VkAccessFlags>(is_initialized ? VK_ACCESS_SHADER_READ_BIT
+                                                                      : VK_ACCESS_NONE),
+            .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+            .oldLayout = is_initialized ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_UNDEFINED,
+            .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = dst_image,
+            .subresourceRange{
+                .aspectMask = aspect,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
+                                   (is_initialized ? vk::PIPELINE_STAGE_GRAPHICS_COMPUTE
+                                                   : VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT),
+                               VK_PIPELINE_STAGE_TRANSFER_BIT, 0, {}, buffer_barrier, pre_copy);
+
+        const VkBufferImageCopy copy{
+            .bufferOffset = out_offset,
+            .bufferRowLength = 0,
+            .bufferImageHeight = 0,
+            .imageSubresource{
+                .aspectMask = aspect,
+                .mipLevel = 0,
+                .baseArrayLayer = 0,
+                .layerCount = depth,
+            },
+            .imageOffset = {0, 0, 0},
+            .imageExtent = {width, height, 1},
+        };
+        cmdbuf.CopyBufferToImage(out_buffer, dst_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, copy);
+
+        const VkImageMemoryBarrier post_copy{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
+            .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = dst_image,
+            .subresourceRange{
+                .aspectMask = aspect,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, vk::PIPELINE_STAGE_GRAPHICS_COMPUTE,
+                               0, {}, {}, post_copy);
+    });
+}
+
+namespace {
+constexpr u32 BL3DB_BINDING_INPUT_BUFFER = 0;
+constexpr u32 BL3DB_BINDING_OUTPUT_BUFFER = 1;
+
+struct alignas(16) BlockLinearUnswizzle3DBufferPushConstants {
+    std::array<u32, 3> dim;
+    u32 bytes_per_block_log2;
+    std::array<u32, 3> origin;
+    u32 slice_size;
+    u32 block_size;
+    u32 x_shift;
+    u32 block_height;
+    u32 block_height_mask;
+    u32 block_depth;
+    u32 block_depth_mask;
+};
+static_assert(sizeof(BlockLinearUnswizzle3DBufferPushConstants) <= 128);
+
+constexpr std::array<VkDescriptorSetLayoutBinding, 2> BL3DB_BINDINGS{{
+    {
+        .binding = BL3DB_BINDING_INPUT_BUFFER,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .descriptorCount = 1,
+        .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
+        .pImmutableSamplers = nullptr,
+    },
+    {
+        .binding = BL3DB_BINDING_OUTPUT_BUFFER,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .descriptorCount = 1,
+        .stageFlags = VK_SHADER_STAGE_COMPUTE_BIT,
+        .pImmutableSamplers = nullptr,
+    },
+}};
+
+constexpr std::array<VkDescriptorUpdateTemplateEntry, 2> BL3DB_TEMPLATE{{
+    {
+        .dstBinding = BL3DB_BINDING_INPUT_BUFFER,
+        .dstArrayElement = 0,
+        .descriptorCount = 1,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .offset = BL3DB_BINDING_INPUT_BUFFER * sizeof(DescriptorUpdateEntry),
+        .stride = sizeof(DescriptorUpdateEntry),
+    },
+    {
+        .dstBinding = BL3DB_BINDING_OUTPUT_BUFFER,
+        .dstArrayElement = 0,
+        .descriptorCount = 1,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .offset = BL3DB_BINDING_OUTPUT_BUFFER * sizeof(DescriptorUpdateEntry),
+        .stride = sizeof(DescriptorUpdateEntry),
+    },
+}};
+
+constexpr DescriptorBankInfo BL3DB_BANK_INFO{
+    .uniform_buffers = 0,
+    .storage_buffers = 2,
+    .texture_buffers = 0,
+    .image_buffers = 0,
+    .textures = 0,
+    .images = 0,
+    .score = 2,
+};
+} // Anonymous namespace
+
+BlockLinearUnswizzle3DBufferPass::BlockLinearUnswizzle3DBufferPass(
+    const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_,
+    StagingBufferPool& staging_buffer_pool_,
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue_)
+    : ComputePass(device_, scheduler_, descriptor_pool_, BL3DB_BINDINGS, BL3DB_TEMPLATE,
+                  BL3DB_BANK_INFO,
+                  COMPUTE_PUSH_CONSTANT_RANGE<sizeof(BlockLinearUnswizzle3DBufferPushConstants)>,
+                  BLOCK_LINEAR_UNSWIZZLE_3D_BUFFER_COMP_SPV),
+      scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_},
+      compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {}
+
+BlockLinearUnswizzle3DBufferPass::~BlockLinearUnswizzle3DBufferPass() = default;
+
+bool BlockLinearUnswizzle3DBufferPass::IsSupported(const Device& device,
+                                                   const VideoCommon::ImageInfo& info) {
+    if (info.type != VideoCommon::ImageType::e3D) {
+        return false;
+    }
+    if (info.resources.levels != 1 || info.resources.layers != 1) {
+        return false;
+    }
+    if (info.num_samples > 1) {
+        return false;
+    }
+    if (info.size.depth <= 1) {
+        return false;
+    }
+    if (VideoCore::Surface::IsPixelFormatASTC(info.format)) {
+        return false;
+    }
+    if (VideoCore::Surface::IsPixelFormatBCn(info.format) && !device.IsOptimalBcnSupported()) {
+        return false;
+    }
+    const u32 bytes_per_block = VideoCore::Surface::BytesPerBlock(info.format);
+    return bytes_per_block == 4 || bytes_per_block == 8 || bytes_per_block == 16;
+}
+
+void BlockLinearUnswizzle3DBufferPass::Unswizzle(
+    Image& image, const StagingBufferRef& swizzled,
+    std::span<const VideoCommon::SwizzleParameters> swizzles) {
+    if (swizzles.empty()) {
+        return;
+    }
+
+    const VideoCommon::SwizzleParameters& sw = swizzles.front();
+    const auto params = VideoCommon::Accelerated::MakeBlockLinearSwizzle3DParams(sw, image.info);
+
+    const u32 blocks_x = sw.num_tiles.width;
+    const u32 blocks_y = sw.num_tiles.height;
+    const u32 blocks_z = sw.num_tiles.depth;
+    const u32 bytes_per_block = 1u << params.bytes_per_block_log2;
+    const VkDeviceSize output_size =
+        static_cast<VkDeviceSize>(blocks_x) * blocks_y * blocks_z * bytes_per_block;
+
+    const StagingBufferRef output =
+        staging_buffer_pool.Request(static_cast<size_t>(output_size), MemoryUsage::DeviceLocal);
+
+    BlockLinearUnswizzle3DBufferPushConstants pc{};
+    pc.dim = {blocks_x, blocks_y, blocks_z};
+    pc.bytes_per_block_log2 = params.bytes_per_block_log2;
+    pc.origin = params.origin;
+    pc.slice_size = params.slice_size;
+    pc.block_size = params.block_size;
+    pc.x_shift = params.x_shift;
+    pc.block_height = params.block_height;
+    pc.block_height_mask = params.block_height_mask;
+    pc.block_depth = params.block_depth;
+    pc.block_depth_mask = params.block_depth_mask;
+
+    scheduler.RequestOutsideRenderPassOperationContext();
+
+    compute_pass_descriptor_queue.Acquire(scheduler, 2);
+    compute_pass_descriptor_queue.AddBuffer(swizzled.buffer, sw.buffer_offset + swizzled.offset,
+                                            image.guest_size_bytes - sw.buffer_offset);
+    compute_pass_descriptor_queue.AddBuffer(output.buffer, output.offset, output_size);
+
+    const void* descriptor_data = compute_pass_descriptor_queue.UpdateData();
+    const VkDescriptorSet set = descriptor_allocator.Commit();
+
+    const u32 gx = Common::DivCeil(blocks_x, 8u);
+    const u32 gy = Common::DivCeil(blocks_y, 8u);
+    const u32 gz = Common::DivCeil(blocks_z, 4u);
+    const bool is_initialized = image.ExchangeInitialization();
+
+    const VkBuffer out_buffer = output.buffer;
+    const VkDeviceSize out_offset = output.offset;
+    const VkImage dst_image = image.Handle();
+    const VkImageAspectFlags aspect = image.AspectMask();
+    const VkExtent3D extent{
+        .width = image.info.size.width,
+        .height = image.info.size.height,
+        .depth = image.info.size.depth,
+    };
+
+    scheduler.Record([this, set, descriptor_data, pc, gx, gy, gz, output_size, out_buffer,
+                      out_offset, dst_image, aspect, extent,
+                      is_initialized](vk::CommandBuffer cmdbuf) {
+        if (dst_image == VK_NULL_HANDLE || out_buffer == VK_NULL_HANDLE) {
+            return;
+        }
+        device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);
+        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
+        cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(pc), &pc);
+        cmdbuf.Dispatch(gx, gy, gz);
+
+        const VkBufferMemoryBarrier buffer_barrier{
+            .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .buffer = out_buffer,
+            .offset = out_offset,
+            .size = output_size,
+        };
+        const VkImageMemoryBarrier pre_copy{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = static_cast<VkAccessFlags>(is_initialized ? VK_ACCESS_SHADER_READ_BIT
+                                                                      : VK_ACCESS_NONE),
+            .dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+            .oldLayout = is_initialized ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_UNDEFINED,
+            .newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = dst_image,
+            .subresourceRange{
+                .aspectMask = aspect,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
+                                   (is_initialized ? vk::PIPELINE_STAGE_GRAPHICS_COMPUTE
+                                                   : VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT),
+                               VK_PIPELINE_STAGE_TRANSFER_BIT, 0, {}, buffer_barrier, pre_copy);
+
+        const VkBufferImageCopy copy{
+            .bufferOffset = out_offset,
+            .bufferRowLength = 0,
+            .bufferImageHeight = 0,
+            .imageSubresource{
+                .aspectMask = aspect,
+                .mipLevel = 0,
+                .baseArrayLayer = 0,
+                .layerCount = 1,
+            },
+            .imageOffset = {0, 0, 0},
+            .imageExtent = extent,
+        };
+        cmdbuf.CopyBufferToImage(out_buffer, dst_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, copy);
+
+        const VkImageMemoryBarrier post_copy{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
+            .oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = dst_image,
+            .subresourceRange{
+                .aspectMask = aspect,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, vk::PIPELINE_STAGE_GRAPHICS_COMPUTE,
+                               0, {}, {}, post_copy);
+    });
+}
+
 } // namespace Vulkan

src/video_core/renderer_vulkan/vk_compute_pass.h

@@ -164,4 +164,42 @@ private:
     ComputePassDescriptorQueue& compute_pass_descriptor_queue;
 };
 
+class BlockLinearUnswizzle2DPass final : public ComputePass {
+public:
+    explicit BlockLinearUnswizzle2DPass(const Device& device_, Scheduler& scheduler_,
+                                        DescriptorPool& descriptor_pool_,
+                                        StagingBufferPool& staging_buffer_pool_,
+                                        ComputePassDescriptorQueue& compute_pass_descriptor_queue_);
+    ~BlockLinearUnswizzle2DPass();
+
+    [[nodiscard]] static bool IsSupported(const VideoCommon::ImageInfo& info);
+
+    void Unswizzle(Image& image, const StagingBufferRef& swizzled,
+                   std::span<const VideoCommon::SwizzleParameters> swizzles);
+
+private:
+    Scheduler& scheduler;
+    StagingBufferPool& staging_buffer_pool;
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue;
+};
+
+class BlockLinearUnswizzle3DBufferPass final : public ComputePass {
+public:
+    explicit BlockLinearUnswizzle3DBufferPass(
+        const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_,
+        StagingBufferPool& staging_buffer_pool_,
+        ComputePassDescriptorQueue& compute_pass_descriptor_queue_);
+    ~BlockLinearUnswizzle3DBufferPass();
+
+    [[nodiscard]] static bool IsSupported(const Device& device, const VideoCommon::ImageInfo& info);
+
+    void Unswizzle(Image& image, const StagingBufferRef& swizzled,
+                   std::span<const VideoCommon::SwizzleParameters> swizzles);
+
+private:
+    Scheduler& scheduler;
+    StagingBufferPool& staging_buffer_pool;
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue;
+};
+
 } // namespace Vulkan

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -63,6 +63,8 @@ using VideoCommon::GenericEnvironment;
 using VideoCommon::GraphicsEnvironment;
 
 constexpr u32 CACHE_VERSION = 18;
+constexpr size_t VULKAN_CACHE_FLUSH_PIPELINES = 128;
+constexpr size_t VULKAN_CACHE_FLUSH_MIN_SECONDS = 30;
 constexpr std::array<char, 8> VULKAN_CACHE_MAGIC_NUMBER{'y', 'u', 'z', 'u', 'v', 'k', 'c', 'h'};
 
 template <typename Container>
@@ -699,6 +701,10 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
     if (use_vulkan_pipeline_cache) {
         SerializeVulkanPipelineCache(vulkan_pipeline_cache_filename, vulkan_pipeline_cache,
                                      CACHE_VERSION);
+        size_t size = 0;
+        vulkan_pipeline_cache.Read(&size, nullptr);
+        last_cache_size.store(size, std::memory_order_relaxed);
+        last_flush = std::chrono::steady_clock::now();
     }
 
     if (state.statistics) {
@@ -706,6 +712,35 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
     }
 }
 
+void PipelineCache::QueueVulkanPipelineCacheFlush() {
+    if (!use_vulkan_pipeline_cache || vulkan_pipeline_cache_filename.empty()) {
+        return;
+    }
+    if (++pipelines_since_flush < VULKAN_CACHE_FLUSH_PIPELINES) {
+        return;
+    }
+    const auto now = std::chrono::steady_clock::now();
+    const auto megabytes = last_cache_size.load(std::memory_order_relaxed) / (1024 * 1024);
+    const std::chrono::seconds interval{
+        std::max<size_t>(VULKAN_CACHE_FLUSH_MIN_SECONDS, megabytes)};
+    if (last_flush.time_since_epoch().count() != 0 && now - last_flush < interval) {
+        return;
+    }
+    if (flush_in_flight.exchange(true, std::memory_order_acq_rel)) {
+        return;
+    }
+    pipelines_since_flush = 0;
+    last_flush = now;
+    serialization_thread.QueueWork([this] {
+        SerializeVulkanPipelineCache(vulkan_pipeline_cache_filename, vulkan_pipeline_cache,
+                                     CACHE_VERSION);
+        size_t size = 0;
+        vulkan_pipeline_cache.Read(&size, nullptr);
+        last_cache_size.store(size, std::memory_order_relaxed);
+        flush_in_flight.store(false, std::memory_order_release);
+    });
+}
+
 GraphicsPipeline* PipelineCache::CurrentGraphicsPipelineSlowPath() {
     const auto [pair, is_new]{graphics_cache.try_emplace(graphics_key)};
     auto& pipeline{pair->second};
@@ -744,7 +779,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
     std::span<Shader::Environment* const> envs, PipelineStatistics* statistics,
     bool build_in_parallel) try {
     auto hash = key.Hash();
-    LOG_INFO(Render_Vulkan, "{:#016x}", hash);
+    LOG_DEBUG(Render_Vulkan, "{:#016x}", hash);
     size_t env_index{0};
     std::array<Shader::IR::Program, Maxwell::MaxShaderProgram> programs;
     const bool uses_vertex_a{key.unique_hashes[0] != 0};
@@ -880,6 +915,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline() {
         }
         SerializePipeline(key, env_ptrs, pipeline_cache_filename, CACHE_VERSION);
     });
+    QueueVulkanPipelineCacheFlush();
     return pipeline;
 }
 
@@ -899,6 +935,7 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
         SerializePipeline(key, std::array<const GenericEnvironment*, 1>{&env_},
                           pipeline_cache_filename, CACHE_VERSION);
     });
+    QueueVulkanPipelineCacheFlush();
     return pipeline;
 }
 
@@ -911,7 +948,7 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
         return nullptr;
     }
 
-    LOG_INFO(Render_Vulkan, "{:#016x}", hash);
+    LOG_DEBUG(Render_Vulkan, "{:#016x}", hash);
 
     Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()};
 

src/video_core/renderer_vulkan/vk_pipeline_cache.h

@@ -7,6 +7,8 @@
 #pragma once
 
 #include <array>
+#include <atomic>
+#include <chrono>
 #include <cstddef>
 #include <filesystem>
 #include <memory>
@@ -144,6 +146,8 @@ private:
     vk::PipelineCache LoadVulkanPipelineCache(const std::filesystem::path& filename,
                                               u32 expected_cache_version);
 
+    void QueueVulkanPipelineCacheFlush();
+
     const Device& device;
     Scheduler& scheduler;
     DescriptorPool& descriptor_pool;
@@ -171,6 +175,10 @@ private:
 
     std::filesystem::path vulkan_pipeline_cache_filename;
     vk::PipelineCache vulkan_pipeline_cache;
+    size_t pipelines_since_flush{};
+    std::chrono::steady_clock::time_point last_flush{};
+    std::atomic<size_t> last_cache_size{};
+    std::atomic_bool flush_in_flight{};
 
     Common::ThreadWorker workers;
     Common::ThreadWorker serialization_thread;

src/video_core/renderer_vulkan/vk_present_manager.cpp

@@ -7,7 +7,6 @@
 #include "common/settings.h"
 #include "common/thread.h"
 #include "core/frontend/emu_window.h"
-#include "video_core/renderer_vulkan/present/lsfg_common.h"
 #include "video_core/renderer_vulkan/vk_present_manager.h"
 #include "video_core/renderer_vulkan/vk_scheduler.h"
 #include "video_core/renderer_vulkan/vk_swapchain.h"
@@ -20,17 +19,6 @@ namespace Vulkan {
 
 namespace {
 
-constexpr size_t MAX_FRAMES_IN_FLIGHT = 7;
-static_assert(MAX_FRAMES_IN_FLIGHT <= LSFG_MAX_TARGETS);
-
-bool CanStoreToFrame(const vk::PhysicalDevice& physical_device, VkFormat format) {
-    if (!Settings::values.frame_gen.GetValue()) {
-        return false;
-    }
-    const VkFormatProperties props{physical_device.GetFormatProperties(format)};
-    return (props.optimalTilingFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) != 0;
-}
-
 bool CanBlitToSwapchain(const vk::PhysicalDevice& physical_device, VkFormat format) {
     const VkFormatProperties props{physical_device.GetFormatProperties(format)};
     return (props.optimalTilingFeatures & VK_FORMAT_FEATURE_BLIT_DST_BIT);
@@ -122,7 +110,6 @@ PresentManager::PresentManager(const vk::Instance& instance_,
     , swapchain{swapchain_}
     , surface{surface_}
     , blit_supported{CanBlitToSwapchain(device.GetPhysical(), swapchain.GetImageViewFormat())}
-    , storage_supported{CanStoreToFrame(device.GetPhysical(), swapchain.GetImageFormat())}
     , use_present_thread{Settings::values.async_presentation.GetValue()}
 {
     SetImageCount();
@@ -140,7 +127,6 @@ PresentManager::PresentManager(const vk::Instance& instance_,
     frames.resize(image_count);
     for (u32 i = 0; i < frames.size(); i++) {
         Frame& frame = frames[i];
-        frame.index = i;
         frame.cmdbuf = vk::CommandBuffer{cmdbuffers[i], device.GetDispatchLoader()};
         frame.render_ready = dld.CreateSemaphore({
             .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
@@ -193,10 +179,6 @@ void PresentManager::Present(Frame* frame) {
     }
 }
 
-size_t PresentManager::MaxExtraFrames() const {
-    return image_count - 1;
-}
-
 void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, VkFormat image_view_format,
                                    VkRenderPass rd) {
     auto& dld = device.GetLogical();
@@ -204,9 +186,6 @@ void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, VkFormat
     frame->width = width;
     frame->height = height;
 
-    const VkImageUsageFlags storage_usage =
-        storage_supported ? static_cast<VkImageUsageFlags>(VK_IMAGE_USAGE_STORAGE_BIT) : 0;
-
     frame->image = memory_allocator.CreateImage({
         .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
         .pNext = nullptr,
@@ -223,8 +202,7 @@ void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, VkFormat
         .arrayLayers = 1,
         .samples = VK_SAMPLE_COUNT_1_BIT,
         .tiling = VK_IMAGE_TILING_OPTIMAL,
-        .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-                 VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | storage_usage,
+        .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
         .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
         .queueFamilyIndexCount = 0,
         .pQueueFamilyIndices = nullptr,
@@ -255,33 +233,6 @@ void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, VkFormat
             },
     });
 
-    frame->storage_view = vk::ImageView{};
-    if (storage_supported) {
-        frame->storage_view = dld.CreateImageView({
-            .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
-            .pNext = nullptr,
-            .flags = 0,
-            .image = *frame->image,
-            .viewType = VK_IMAGE_VIEW_TYPE_2D,
-            .format = swapchain.GetImageFormat(),
-            .components =
-                {
-                    .r = VK_COMPONENT_SWIZZLE_IDENTITY,
-                    .g = VK_COMPONENT_SWIZZLE_IDENTITY,
-                    .b = VK_COMPONENT_SWIZZLE_IDENTITY,
-                    .a = VK_COMPONENT_SWIZZLE_IDENTITY,
-                },
-            .subresourceRange =
-                {
-                    .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
-                    .baseMipLevel = 0,
-                    .levelCount = 1,
-                    .baseArrayLayer = 0,
-                    .layerCount = 1,
-                },
-        });
-    }
-
     const VkImageView image_view{*frame->image_view};
     frame->framebuffer = dld.CreateFramebuffer({
         .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
@@ -350,11 +301,7 @@ void PresentManager::SetImageCount() {
     // We cannot have more than 7 images in flight at any given time.
     // FRAMES_IN_FLIGHT is 8, and the cache TICKS_TO_DESTROY is 8.
     // Mali drivers will give us 6.
-    const size_t generations = Settings::FrameGenMaxGenerations();
-    const size_t queued_composites = Settings::values.frame_gen_queue_target.GetValue() + 1;
-    image_count =
-        std::clamp<size_t>((generations + 1) * queued_composites, swapchain.GetImageCount(),
-                           MAX_FRAMES_IN_FLIGHT);
+    image_count = std::min<size_t>(swapchain.GetImageCount(), 7);
 }
 
 void PresentManager::CopyToSwapchain(Frame* frame) {

src/video_core/renderer_vulkan/vk_present_manager.h

@@ -28,10 +28,8 @@ class Swapchain;
 struct Frame {
     u32 width;
     u32 height;
-    u32 index;
     vk::Image image;
     vk::ImageView image_view;
-    vk::ImageView storage_view;
     vk::Framebuffer framebuffer;
     vk::CommandBuffer cmdbuf;
     vk::Semaphore render_ready;
@@ -62,9 +60,6 @@ public:
     /// Waits for the present thread to finish presenting all queued frames.
     void WaitPresent();
 
-    /// How many additional frames can be queued without stalling the render thread
-    [[nodiscard]] size_t MaxExtraFrames() const;
-
 private:
     void PresentThread(std::stop_token token);
 
@@ -95,7 +90,6 @@ private:
     std::mutex free_mutex;
     std::jthread present_thread;
     bool blit_supported;
-    bool storage_supported;
     bool use_present_thread;
     std::size_t image_count{};
 };

src/video_core/renderer_vulkan/vk_render_pass_cache.cpp

@@ -145,18 +145,6 @@ VkRenderPass RenderPassCache::Get(const RenderPassKey& key) {
         .preserveAttachmentCount = 0,
         .pPreserveAttachments = nullptr,
     };
-    const VkSubpassDependency dependency{
-            .srcSubpass = 0,  // Current subpass
-            .dstSubpass = 0,  // Same subpass (self-dependency)
-            .srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                            VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
-                            VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
-            .dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-            .srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT |
-                             VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
-            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT,
-            .dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT
-    };
     pair->second = device->GetLogical().CreateRenderPass({
         .sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
         .pNext = nullptr,
@@ -165,8 +153,8 @@ VkRenderPass RenderPassCache::Get(const RenderPassKey& key) {
         .pAttachments = descriptions.empty() ? nullptr : descriptions.data(),
         .subpassCount = 1,
         .pSubpasses = &subpass,
-        .dependencyCount = 1,
-        .pDependencies = &dependency,
+        .dependencyCount = 0,
+        .pDependencies = nullptr,
     });
     return *pair->second;
 }

src/video_core/renderer_vulkan/vk_render_pass_cache.h

@@ -9,6 +9,7 @@
 #include <mutex>
 #include <ankerl/unordered_dense.h>
 
+#include "common/container_hash.h"
 #include "video_core/surface.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 
@@ -31,17 +32,26 @@ struct RenderPassKey {
 namespace std {
 template <>
 struct hash<Vulkan::RenderPassKey> {
+    static_assert(std::tuple_size_v<decltype(Vulkan::RenderPassKey::color_formats)> <= 8);
+    static_assert(static_cast<u32>(VideoCore::Surface::PixelFormat::Invalid) <= 0xFF);
+    static_assert(static_cast<u32>(VideoCore::Surface::PixelFormat::Max) <= 0xFF);
+    static_assert(VK_SAMPLE_COUNT_64_BIT <= 0xFF);
+
     [[nodiscard]] size_t operator()(const Vulkan::RenderPassKey& key) const noexcept {
-        size_t value = static_cast<size_t>(key.depth_format) << 48;
-        value ^= static_cast<size_t>(key.samples) << 52;
-        value ^= static_cast<size_t>(key.resolve_color) << 63;
-        value ^= static_cast<size_t>(key.color_clear_mask) << 54;
-        value ^= static_cast<size_t>(key.depth_stencil_clear) << 62;
-        value ^= static_cast<size_t>(key.color_discard_mask) << 24;
-        for (size_t i = 0; i < key.color_formats.size(); ++i) {
-            value ^= static_cast<size_t>(key.color_formats[i]) << (i * 6);
+        u64 formats = 0;
+        for (size_t index = 0; index < key.color_formats.size(); ++index) {
+            formats |= static_cast<u64>(key.color_formats[index]) << (index * 8);
         }
-        return value;
+        const u64 state = static_cast<u64>(key.depth_format) |
+                          (static_cast<u64>(key.samples) << 8) |
+                          (static_cast<u64>(key.color_clear_mask) << 16) |
+                          (static_cast<u64>(key.color_discard_mask) << 24) |
+                          (static_cast<u64>(key.resolve_color) << 32) |
+                          (static_cast<u64>(key.depth_stencil_clear) << 33);
+        size_t seed = 0;
+        Common::HashCombine(seed, formats);
+        Common::HashCombine(seed, state);
+        return seed;
     }
 };
 } // namespace std

src/video_core/renderer_vulkan/vk_scheduler.h

@@ -146,10 +146,9 @@ public:
             frame_counter++;
             auto target_time = start_time + frame_interval * frame_counter;
             if (target_time >= now) {
-                constexpr auto spin_tail = std::chrono::milliseconds(1);
                 auto sleep_time = target_time - now;
-                if (sleep_time > spin_tail * 2) {
-                    std::this_thread::sleep_for(sleep_time - spin_tail);
+                if (sleep_time > std::chrono::milliseconds(15)) {
+                    std::this_thread::sleep_for(sleep_time - std::chrono::milliseconds(1));
                 }
                 while (std::chrono::steady_clock::now() < target_time) {
                     std::this_thread::yield();

src/video_core/renderer_vulkan/vk_swapchain.cpp

@@ -48,9 +48,6 @@ static VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox,
     Settings::VSyncMode setting = [has_imm, has_mailbox]() {
         // Choose Mailbox or Immediate if unlocked and those modes are supported
         const auto mode = Settings::values.vsync_mode.GetValue();
-        if (Settings::values.frame_gen.GetValue()) {
-            return mode == Settings::VSyncMode::FifoRelaxed ? mode : Settings::VSyncMode::Fifo;
-        }
         if (Settings::values.use_speed_limit.GetValue() &&
             Settings::values.current_speed_mode.GetValue() != Settings::SpeedMode::Turbo) {
             return mode;

src/video_core/renderer_vulkan/vk_texture_cache.cpp

@@ -628,18 +628,12 @@ void CopyBufferToImage(vk::CommandBuffer cmdbuf, VkBuffer src_buffer, VkImage im
             .subresourceRange = subresource_range,
     };
 
-    cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-                           VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-                           VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0,
+    cmdbuf.PipelineBarrier(vk::PIPELINE_STAGE_GRAPHICS_COMPUTE, VK_PIPELINE_STAGE_TRANSFER_BIT, 0,
                            read_barrier);
     cmdbuf.CopyBufferToImage(src_buffer, image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, copies);
     // TODO: Move this to another API
-    cmdbuf.PipelineBarrier(
-            VK_PIPELINE_STAGE_TRANSFER_BIT,
-            VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT |
-            VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
-            VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-            0, nullptr, nullptr, write_barrier);
+    cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, vk::PIPELINE_STAGE_GRAPHICS_COMPUTE, 0,
+                           nullptr, nullptr, write_barrier);
 }
 
 [[nodiscard]] VkImageBlit MakeImageBlit(const Region2D& dst_region, const Region2D& src_region,
@@ -933,6 +927,10 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, Scheduler& sched
         bl3d_unswizzle_pass.emplace(device, scheduler, descriptor_pool,
                                    staging_buffer_pool, compute_pass_descriptor_queue);
     }
+    bl2d_unswizzle_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,
+                                compute_pass_descriptor_queue);
+    bl3db_unswizzle_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,
+                                 compute_pass_descriptor_queue);
 }
 
 void TextureCacheRuntime::Finish() {
@@ -1796,6 +1794,13 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
         }
         flags |= VideoCommon::ImageFlagBits::Converted;
         flags |= VideoCommon::ImageFlagBits::CostlyLoad;
+    } else if (runtime->bl2d_unswizzle_pass && BlockLinearUnswizzle2DPass::IsSupported(info)) {
+        flags |= VideoCommon::ImageFlagBits::AcceleratedUpload;
+        flags |= VideoCommon::ImageFlagBits::CostlyLoad;
+    } else if (runtime->bl3db_unswizzle_pass &&
+               BlockLinearUnswizzle3DBufferPass::IsSupported(runtime->device, info)) {
+        flags |= VideoCommon::ImageFlagBits::AcceleratedUpload;
+        flags |= VideoCommon::ImageFlagBits::CostlyLoad;
     }
     if (IsPixelFormatBCn(info.format) && !runtime->device.IsOptimalBcnSupported()) {
         flags |= VideoCommon::ImageFlagBits::Converted;
@@ -2827,11 +2832,25 @@ VkRenderPass Framebuffer::RenderPassVariant(u32 color_clear_mask, bool depth_ste
     if (color_clear_mask == 0 && !depth_stencil_clear && color_discard_mask == 0) {
         return renderpass;
     }
+    static_assert(NUM_RT <= 8);
+    const u32 variant_key = color_clear_mask | (color_discard_mask << 8) |
+                            (static_cast<u32>(depth_stencil_clear) << 16);
+    for (u32 index = 0; index < num_memoized_variants; ++index) {
+        if (variant_keys[index] == variant_key) {
+            return variant_render_passes[index];
+        }
+    }
     RenderPassKey key = render_pass_key;
     key.color_clear_mask = color_clear_mask;
     key.depth_stencil_clear = depth_stencil_clear;
     key.color_discard_mask = color_discard_mask;
-    return render_pass_cache->Get(key);
+    const VkRenderPass variant = render_pass_cache->Get(key);
+    if (num_memoized_variants < variant_keys.size()) {
+        variant_keys[num_memoized_variants] = variant_key;
+        variant_render_passes[num_memoized_variants] = variant;
+        ++num_memoized_variants;
+    }
+    return variant;
 }
 
 void TextureCacheRuntime::AccelerateImageUpload(
@@ -2843,6 +2862,15 @@ void TextureCacheRuntime::AccelerateImageUpload(
         return astc_decoder_pass->Assemble(image, map, swizzles);
     }
 
+    if (bl2d_unswizzle_pass && BlockLinearUnswizzle2DPass::IsSupported(image.info)) {
+        return bl2d_unswizzle_pass->Unswizzle(image, map, swizzles);
+    }
+
+    if (bl3db_unswizzle_pass &&
+        BlockLinearUnswizzle3DBufferPass::IsSupported(device, image.info)) {
+        return bl3db_unswizzle_pass->Unswizzle(image, map, swizzles);
+    }
+
     if (!Settings::values.gpu_unswizzle_enabled.GetValue() || !bl3d_unswizzle_pass) {
         if (IsPixelFormatBCn(image.info.format) && image.info.type == ImageType::e3D) {
             ASSERT(false && "GPU unswizzle is disabled for BCn 3D texture");

src/video_core/renderer_vulkan/vk_texture_cache.h

@@ -149,6 +149,8 @@ public:
     std::optional<ASTCDecoderPass> astc_decoder_pass;
 
     std::optional<BlockLinearUnswizzle3DPass> bl3d_unswizzle_pass;
+    std::optional<BlockLinearUnswizzle2DPass> bl2d_unswizzle_pass;
+    std::optional<BlockLinearUnswizzle3DBufferPass> bl3db_unswizzle_pass;
     const Settings::ResolutionScalingInfo& resolution;
     std::array<std::vector<VkFormat>, VideoCore::Surface::MaxPixelFormat> view_formats;
 
@@ -246,6 +248,8 @@ public:
     }
 
 private:
+    static constexpr size_t NUM_MEMOIZED_RENDER_PASS_VARIANTS = 8;
+
     vk::Framebuffer framebuffer;
     VkRenderPass renderpass{};
     VkExtent2D render_area{};
@@ -263,6 +267,9 @@ private:
     RenderPassKey render_pass_key{};
     RenderPassCache* render_pass_cache{nullptr};
     bool discard_msaa_color{};
+    mutable std::array<u32, NUM_MEMOIZED_RENDER_PASS_VARIANTS> variant_keys{};
+    mutable std::array<VkRenderPass, NUM_MEMOIZED_RENDER_PASS_VARIANTS> variant_render_passes{};
+    mutable u32 num_memoized_variants{};
 };
 
 class Image : public VideoCommon::ImageBase {

src/video_core/textures/decoders.cpp

@@ -1,9 +1,10 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstring>
@@ -30,12 +31,62 @@ constexpr u32 pdep(u32 value) {
     return result;
 }
 
+constexpr u32 SWIZZLE_RUN_BYTES = 16;
+constexpr u32 SWIZZLE_RUN_SHIFT = 4;
+constexpr u32 SWIZZLE_RUN_MASK = SWIZZLE_RUN_BYTES - 1;
+constexpr u32 SWIZZLE_RUN_INDEX_MASK = GOB_SIZE_X / SWIZZLE_RUN_BYTES - 1;
+
+static_assert((SWIZZLE_X_BITS & SWIZZLE_RUN_MASK) == SWIZZLE_RUN_MASK);
+
+constexpr std::array<u32, GOB_SIZE_X / SWIZZLE_RUN_BYTES> SWIZZLE_X_RUN_TABLE = [] {
+    std::array<u32, GOB_SIZE_X / SWIZZLE_RUN_BYTES> table{};
+    for (u32 index = 0; index < static_cast<u32>(table.size()); ++index) {
+        table[index] = pdep<SWIZZLE_X_BITS>(index << SWIZZLE_RUN_SHIFT);
+    }
+    return table;
+}();
+
 template <u32 mask, u32 incr_amount>
 void incrpdep(u32& value) {
     static constexpr u32 swizzled_incr = pdep<mask>(incr_amount);
     value = ((value | ~mask) + swizzled_incr) & mask;
 }
 
+template <bool TO_LINEAR>
+void SwizzleRow(std::span<u8> output, std::span<const u8> input, u32 offset_zy, u32 swizzled_y,
+                u32 x_shift, u32 x, u32 num_bytes, u32 linear) {
+    const auto copy = [&](u32 swizzled_x, u32 count) {
+        const u32 swizzled =
+            offset_zy + ((x >> GOB_SIZE_X_SHIFT) << x_shift) + (swizzled_x | swizzled_y);
+        u8* const dst = &output[TO_LINEAR ? swizzled : linear];
+        const u8* const src = &input[TO_LINEAR ? linear : swizzled];
+        std::memcpy(dst, src, count);
+        x += count;
+        linear += count;
+    };
+
+    u32 swizzled_run = SWIZZLE_X_RUN_TABLE[(x >> SWIZZLE_RUN_SHIFT) & SWIZZLE_RUN_INDEX_MASK];
+    u32 remaining = num_bytes;
+
+    const u32 head =
+        (std::min)(SWIZZLE_RUN_BYTES - (x & SWIZZLE_RUN_MASK), remaining) & SWIZZLE_RUN_MASK;
+    if (head != 0) {
+        copy(swizzled_run | (x & SWIZZLE_RUN_MASK), head);
+        remaining -= head;
+        incrpdep<SWIZZLE_X_BITS, SWIZZLE_RUN_BYTES>(swizzled_run);
+    }
+
+    while (remaining >= SWIZZLE_RUN_BYTES) {
+        copy(swizzled_run, SWIZZLE_RUN_BYTES);
+        remaining -= SWIZZLE_RUN_BYTES;
+        incrpdep<SWIZZLE_X_BITS, SWIZZLE_RUN_BYTES>(swizzled_run);
+    }
+
+    if (remaining != 0) {
+        copy(swizzled_run, remaining);
+    }
+}
+
 template <bool TO_LINEAR, u32 BYTES_PER_PIXEL>
 void SwizzleImpl(std::span<u8> output, std::span<const u8> input, u32 width, u32 height, u32 depth,
                  u32 block_height, u32 block_depth, u32 stride) {
@@ -70,23 +121,9 @@ void SwizzleImpl(std::span<u8> output, std::span<const u8> input, u32 width, u32
             const u32 offset_y = (block_y >> block_height) * block_size +
                                  ((block_y & block_height_mask) << GOB_SIZE_SHIFT);
 
-            u32 swizzled_x = pdep<SWIZZLE_X_BITS>(origin_x * BYTES_PER_PIXEL);
-            for (u32 column = 0; column < width;
-                 ++column, incrpdep<SWIZZLE_X_BITS, BYTES_PER_PIXEL>(swizzled_x)) {
-                const u32 x = (column + origin_x) * BYTES_PER_PIXEL;
-                const u32 offset_x = (x >> GOB_SIZE_X_SHIFT) << x_shift;
-
-                const u32 base_swizzled_offset = offset_z + offset_y + offset_x;
-                const u32 swizzled_offset = base_swizzled_offset + (swizzled_x | swizzled_y);
-
-                const u32 unswizzled_offset =
-                    slice * pitch * height + line * pitch + column * BYTES_PER_PIXEL;
-
-                u8* const dst = &output[TO_LINEAR ? swizzled_offset : unswizzled_offset];
-                const u8* const src = &input[TO_LINEAR ? unswizzled_offset : swizzled_offset];
-
-                std::memcpy(dst, src, BYTES_PER_PIXEL);
-            }
+            SwizzleRow<TO_LINEAR>(output, input, offset_z + offset_y, swizzled_y, x_shift,
+                                  origin_x * BYTES_PER_PIXEL, width * BYTES_PER_PIXEL,
+                                  slice * pitch * height + line * pitch);
         }
     }
 }
@@ -129,23 +166,9 @@ void SwizzleSubrectImpl(std::span<u8> output, std::span<const u8> input, u32 wid
             const u32 offset_y = (block_y >> block_height) * block_size +
                                  ((block_y & block_height_mask) << GOB_SIZE_SHIFT);
 
-            u32 swizzled_x = pdep<SWIZZLE_X_BITS>(origin_x * BYTES_PER_PIXEL);
-            for (u32 column = 0; column < extent_x;
-                 ++column, incrpdep<SWIZZLE_X_BITS, BYTES_PER_PIXEL>(swizzled_x)) {
-                const u32 x = (column + origin_x) * BYTES_PER_PIXEL;
-                const u32 offset_x = (x >> GOB_SIZE_X_SHIFT) << x_shift;
-
-                const u32 base_swizzled_offset = offset_z + offset_y + offset_x;
-                const u32 swizzled_offset = base_swizzled_offset + (swizzled_x | swizzled_y);
-
-                const u32 unswizzled_offset =
-                    slice * pitch * height + line * pitch + column * BYTES_PER_PIXEL;
-
-                u8* const dst = &output[TO_LINEAR ? swizzled_offset : unswizzled_offset];
-                const u8* const src = &input[TO_LINEAR ? unswizzled_offset : swizzled_offset];
-
-                std::memcpy(dst, src, BYTES_PER_PIXEL);
-            }
+            SwizzleRow<TO_LINEAR>(output, input, offset_z + offset_y, swizzled_y, x_shift,
+                                  origin_x * BYTES_PER_PIXEL, extent_x * BYTES_PER_PIXEL,
+                                  slice * pitch * height + line * pitch);
         }
         unprocessed_lines -= lines_in_y;
         if (unprocessed_lines == 0) {

src/video_core/vulkan_common/vulkan_device.cpp

@@ -7,6 +7,8 @@
 #include <algorithm>
 #include <bitset>
 #include <chrono>
+#include <filesystem>
+#include <fstream>
 #include <optional>
 #include <thread>
 #include <ankerl/unordered_dense.h>
@@ -16,6 +18,8 @@
 #include <fmt/format.h>
 
 #include "common/assert.h"
+#include "common/fs/fs.h"
+#include "common/fs/path_util.h"
 #include "common/literals.h"
 #include <ranges>
 #include "common/settings.h"
@@ -393,6 +397,17 @@ std::vector<const char*> ExtensionListForVulkan(
     return output;
 }
 
+constexpr std::array<char, 8> STATIC_CACHE_MAGIC_NUMBER{'e', 'd', 'e', 'n', 's', 't', 'p', 'c'};
+constexpr u32 STATIC_CACHE_VERSION = 1;
+
+std::filesystem::path StaticPipelineCacheFilename() {
+    const auto shader_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::ShaderDir);
+    if (!Common::FS::CreateDir(shader_dir)) {
+        return {};
+    }
+    return shader_dir / "vulkan_static_pipelines.bin";
+}
+
 } // Anonymous namespace
 
 void Device::RemoveExtension(bool& extension, const std::string& extension_name) {
@@ -780,15 +795,100 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
 
     vk::Check(vmaCreateAllocator(&allocator_info, &allocator));
 
+    owns_static_pipeline_cache = surface != VkSurfaceKHR{};
+    LoadStaticPipelineCache();
+
     // Initialize GPU logging if enabled
     InitializeGPULogging();
 }
 
 Device::~Device() {
+    SaveStaticPipelineCache();
     ShutdownGPULogging();
     vmaDestroyAllocator(allocator);
 }
 
+void Device::LoadStaticPipelineCache() {
+    const auto create = [this](size_t size, const void* data) {
+        static_pipeline_cache = logical.CreatePipelineCache({
+            .sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
+            .pNext = nullptr,
+            .flags = 0,
+            .initialDataSize = size,
+            .pInitialData = data,
+        });
+    };
+    if (!owns_static_pipeline_cache) {
+        create(0, nullptr);
+        return;
+    }
+    const auto filename = StaticPipelineCacheFilename();
+    if (filename.empty()) {
+        create(0, nullptr);
+        return;
+    }
+    std::vector<char> data;
+    try {
+        std::ifstream file(filename, std::ios::binary | std::ios::ate);
+        if (!file.is_open()) {
+            create(0, nullptr);
+            return;
+        }
+        file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+        const size_t total = static_cast<size_t>(file.tellg());
+        file.seekg(0, std::ios::beg);
+        std::array<char, 8> magic{};
+        u32 version{};
+        if (total < magic.size() + sizeof(version)) {
+            create(0, nullptr);
+            return;
+        }
+        file.read(magic.data(), magic.size())
+            .read(reinterpret_cast<char*>(&version), sizeof(version));
+        if (magic != STATIC_CACHE_MAGIC_NUMBER || version != STATIC_CACHE_VERSION) {
+            create(0, nullptr);
+            return;
+        }
+        data.resize(total - magic.size() - sizeof(version));
+        file.read(data.data(), static_cast<std::streamsize>(data.size()));
+    } catch (const std::ios_base::failure& e) {
+        create(0, nullptr);
+        return;
+    }
+    create(data.size(), data.empty() ? nullptr : data.data());
+}
+
+void Device::SaveStaticPipelineCache() const {
+    if (!owns_static_pipeline_cache || !static_pipeline_cache) {
+        return;
+    }
+    const auto filename = StaticPipelineCacheFilename();
+    if (filename.empty()) {
+        return;
+    }
+    size_t size = 0;
+    std::vector<char> data;
+    static_pipeline_cache.Read(&size, nullptr);
+    if (size == 0) {
+        return;
+    }
+    data.resize(size);
+    static_pipeline_cache.Read(&size, data.data());
+    try {
+        std::ofstream file(filename, std::ios::binary | std::ios::trunc);
+        file.exceptions(std::ofstream::failbit);
+        if (!file.is_open()) {
+            return;
+        }
+        file.write(STATIC_CACHE_MAGIC_NUMBER.data(), STATIC_CACHE_MAGIC_NUMBER.size())
+            .write(reinterpret_cast<const char*>(&STATIC_CACHE_VERSION),
+                   sizeof(STATIC_CACHE_VERSION))
+            .write(data.data(), static_cast<std::streamsize>(size));
+    } catch (const std::ios_base::failure& e) {
+        Common::FS::RemoveFile(filename);
+    }
+}
+
 VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags wanted_usage,
                                     FormatType format_type) const {
     if (IsFormatSupported(wanted_format, wanted_usage, format_type)) {

src/video_core/vulkan_common/vulkan_device.h

@@ -37,8 +37,7 @@ VK_DEFINE_HANDLE(VmaAllocator)
     FEATURE(EXT, HostQueryReset, HOST_QUERY_RESET, host_query_reset)                               \
     FEATURE(KHR, 8BitStorage, 8BIT_STORAGE, bit8_storage)                                          \
     FEATURE(KHR, BufferDeviceAddress, BUFFER_DEVICE_ADDRESS, buffer_device_address)                \
-    FEATURE(KHR, TimelineSemaphore, TIMELINE_SEMAPHORE, timeline_semaphore)                        \
-    FEATURE(KHR, VulkanMemoryModel, VULKAN_MEMORY_MODEL, vulkan_memory_model)
+    FEATURE(KHR, TimelineSemaphore, TIMELINE_SEMAPHORE, timeline_semaphore)
 
 #define FOR_EACH_VK_FEATURE_1_3(FEATURE)                                                           \
     FEATURE(EXT, ImageRobustness, IMAGE_ROBUSTNESS, robust_image_access)                           \
@@ -269,6 +268,10 @@ public:
         return physical;
     }
 
+    VkPipelineCache StaticPipelineCache() const noexcept {
+        return *static_pipeline_cache;
+    }
+
     /// Returns the main graphics queue.
     vk::Queue GetGraphicsQueue() const {
         return graphics_queue;
@@ -417,11 +420,6 @@ FN_MAX_LIMIT_LIST
         return features.shader_float16_int8.shaderFloat16;
     }
 
-    /// Returns true if the device can run shaders built against the Vulkan memory model.
-    bool IsVulkanMemoryModelSupported() const {
-        return features.vulkan_memory_model.vulkanMemoryModel;
-    }
-
     /// Returns true if the device supports int8 natively.
     bool IsInt8Supported() const {
         return features.shader_float16_int8.shaderInt8;
@@ -1094,6 +1092,9 @@ private:
     /// Returns true if the device natively supports blitting depth stencil images.
     bool TestDepthStencilBlits(VkFormat format) const;
 
+    void LoadStaticPipelineCache();
+    void SaveStaticPipelineCache() const;
+
 private:
     VkInstance instance;         ///< Vulkan instance.
     VmaAllocator allocator;      ///< VMA allocator.
@@ -1102,6 +1103,8 @@ private:
     vk::Device logical;          ///< Logical device.
     vk::Queue graphics_queue;    ///< Main graphics queue.
     vk::Queue present_queue;     ///< Main present queue.
+    vk::PipelineCache static_pipeline_cache;
+    bool owns_static_pipeline_cache{};
     u32 instance_version{};      ///< Vulkan instance version.
     u32 graphics_family{};       ///< Main graphics queue family index.
     u32 present_family{};        ///< Main present queue family index.

src/yuzu/configuration/shared_widget.cpp

@@ -772,24 +772,10 @@ Builder::Builder(QWidget* parent_, bool runtime_lock_)
 
 Builder::~Builder() = default;
 
-static bool IsAndroidOnly(const Settings::BasicSetting& setting) {
-    const auto id = setting.Id();
-    return id == Settings::values.frame_gen.Id() ||
-           id == Settings::values.frame_gen_multiplier.Id() ||
-           id == Settings::values.frame_gen_flow_scale.Id() ||
-           id == Settings::values.frame_gen_fp16.Id() ||
-           id == Settings::values.frame_gen_dump_flow.Id() ||
-           id == Settings::values.emulate_bgr565.Id();
-}
-
 Widget* Builder::BuildWidget(Settings::BasicSetting* setting,
                              std::vector<std::function<void(bool)>>& apply_funcs,
                              RequestType request, bool managed, float multiplier,
                              Settings::BasicSetting* other_setting, const QString& suffix) const {
-    if (IsAndroidOnly(*setting)) {
-        return nullptr;
-    }
-
     if (!Settings::IsConfiguringGlobal() && !setting->Switchable()) {
         return nullptr;
     }

src/yuzu_cmd/emu_window/emu_window_sdl3.cpp

@@ -5,10 +5,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <SDL3/SDL.h>
-#include <SDL3/SDL_timer.h>
-#ifdef __EMSCRIPTEN__
-#include <emscripten.h>
-#endif
 
 #include "common/logging.h"
 #include "common/scm_rev.h"
@@ -30,17 +26,9 @@ EmuWindow_SDL3::EmuWindow_SDL3(InputCommon::InputSubsystem* input_subsystem_, Co
         LOG_CRITICAL(Frontend, "Failed to initialize SDL3: {}, Exiting...", SDL_GetError());
         exit(1);
     }
-    titlebar_timer = SDL_AddTimer(2000, [](void *userdata, SDL_TimerID, Uint32) -> Uint32 {
-        auto* this_ = (EmuWindow_SDL3*)userdata;
-        auto const results = this_->system.GetAndResetPerfStats();
-        auto const title = fmt::format("{} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc, results.average_game_fps, results.emulation_speed * 100.0f);
-        SDL_SetWindowTitle(this_->render_window, title.c_str());
-        return 2000;
-    }, this);
 }
 
 EmuWindow_SDL3::~EmuWindow_SDL3() {
-    SDL_RemoveTimer(titlebar_timer);
     system.HIDCore().UnloadInputDevices();
     input_subsystem->Shutdown();
     SDL_Quit();
@@ -144,7 +132,8 @@ void EmuWindow_SDL3::Fullscreen() {
     switch (Settings::values.fullscreen_mode.GetValue()) {
     case Settings::FullscreenMode::Exclusive:
         // Set window size to render size before entering fullscreen in exclusive mode.
-        if (const SDL_DisplayMode* display_mode_ptr = SDL_GetDesktopDisplayMode(SDL_GetDisplayForWindow(render_window))) {
+        if (const SDL_DisplayMode* display_mode_ptr =
+                SDL_GetDesktopDisplayMode(SDL_GetDisplayForWindow(render_window))) {
             display_mode = *display_mode_ptr;
             SDL_SetWindowSize(render_window, display_mode.w, display_mode.h);
             SDL_SetWindowFullscreenMode(render_window, &display_mode);
@@ -176,60 +165,92 @@ void EmuWindow_SDL3::Fullscreen() {
     }
 }
 
-void EmuWindow_SDL3::OnEvent(SDL_Event& event) {
-    // Notice how we skip the "update title" aspect on most events
-    // this is because some WMs do NOT like changing titles while resizing
-    // so let's just... not do that, thanks :)
-    // Afterall we don't really expect the user to pay attention to the titlebar
-    // while they're moving a lot of shit around...
+void EmuWindow_SDL3::WaitEvent() {
+    // Called on main thread
+    SDL_Event event;
+
+    if (!SDL_WaitEvent(&event)) {
+        const char* error = SDL_GetError();
+        if (!error || strcmp(error, "") == 0) {
+            // https://github.com/libsdl-org/SDL/issues/5780
+            // Sometimes SDL will return without actually having hit an error condition;
+            // just ignore it in this case.
+            return;
+        }
+
+        LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", error);
+        exit(1);
+    }
+
     switch (event.type) {
     case SDL_EVENT_WINDOW_RESIZED:
     case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
     case SDL_EVENT_WINDOW_MAXIMIZED:
     case SDL_EVENT_WINDOW_RESTORED:
-        return OnResize();
+        OnResize();
+        break;
     case SDL_EVENT_WINDOW_MINIMIZED:
         is_shown = false;
-        return OnResize();
+        OnResize();
+        break;
     case SDL_EVENT_WINDOW_EXPOSED:
         is_shown = true;
-        return OnResize();
+        OnResize();
+        break;
     case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
         is_open = false;
-        return;
+        break;
     case SDL_EVENT_KEY_DOWN:
     case SDL_EVENT_KEY_UP:
-        return OnKeyEvent(int(event.key.scancode), event.key.down ? 1 : 0);
+        OnKeyEvent(static_cast<int>(event.key.scancode), event.key.down ? 1 : 0);
+        break;
     case SDL_EVENT_MOUSE_MOTION:
         // ignore if it came from touch
         if (event.button.which != SDL_TOUCH_MOUSEID)
             OnMouseMotion(event.motion.x, event.motion.y);
-        return;
+        break;
     case SDL_EVENT_MOUSE_BUTTON_DOWN:
     case SDL_EVENT_MOUSE_BUTTON_UP:
         // ignore if it came from touch
-        if (event.button.which != SDL_TOUCH_MOUSEID)
-            OnMouseButton(event.button.button, event.button.down ? 1 : 0, s32(event.button.x), s32(event.button.y));
-        return;
+        if (event.button.which != SDL_TOUCH_MOUSEID) {
+            OnMouseButton(event.button.button, event.button.down ? 1 : 0,
+                          static_cast<s32>(event.button.x), static_cast<s32>(event.button.y));
+        }
+        break;
     case SDL_EVENT_FINGER_DOWN:
-        return OnFingerDown(event.tfinger.x, event.tfinger.y, std::size_t(event.tfinger.touchID));
+        OnFingerDown(event.tfinger.x, event.tfinger.y,
+                     static_cast<std::size_t>(event.tfinger.touchID));
+        break;
     case SDL_EVENT_FINGER_MOTION:
-        return OnFingerMotion(event.tfinger.x, event.tfinger.y, std::size_t(event.tfinger.touchID));
+        OnFingerMotion(event.tfinger.x, event.tfinger.y,
+                       static_cast<std::size_t>(event.tfinger.touchID));
+        break;
     case SDL_EVENT_FINGER_UP:
-        return OnFingerUp();
+        OnFingerUp();
+        break;
     case SDL_EVENT_QUIT:
         is_open = false;
-        return;
+        break;
     default:
         break;
     }
+
+    const u32 current_time = SDL_GetTicks();
+    if (current_time > last_time + 2000) {
+        const auto results = system.GetAndResetPerfStats();
+        const auto title = fmt::format("{} | {}-{} | FPS: {:.0f} ({:.0f}%)",
+                                       Common::g_build_fullname,
+                                       Common::g_scm_branch,
+                                       Common::g_scm_desc,
+                                       results.average_game_fps,
+                                       results.emulation_speed * 100.0);
+        SDL_SetWindowTitle(render_window, title.c_str());
+        last_time = current_time;
+    }
 }
 
 // Credits to Samantas5855 and others for this function.
 void EmuWindow_SDL3::SetWindowIcon() {
-#if defined(__EMSCRIPTEN__) || defined(__wasi__)
-    // Icons do not work yet
-#else
     SDL_IOStream* const yuzu_icon_stream = SDL_IOFromConstMem((void*)yuzu_icon, yuzu_icon_size);
     if (yuzu_icon_stream == nullptr) {
         LOG_WARNING(Frontend, "Failed to create Eden icon stream.");
@@ -243,7 +264,6 @@ void EmuWindow_SDL3::SetWindowIcon() {
     // The icon is attached to the window pointer
     SDL_SetWindowIcon(render_window, window_icon);
     SDL_DestroySurface(window_icon);
-#endif
 }
 
 void EmuWindow_SDL3::OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) {

src/yuzu_cmd/emu_window/emu_window_sdl3.h

@@ -9,12 +9,11 @@
 #include <tuple>
 #include <utility>
 
-#include <SDL3/SDL.h>
-#include <SDL3/SDL_timer.h>
-
 #include "core/frontend/emu_window.h"
 #include "core/frontend/graphics_context.h"
 
+struct SDL_Window;
+
 namespace Core {
 class System;
 }
@@ -36,7 +35,7 @@ public:
     bool IsShown() const override;
 
     /// Wait for the next event on the main thread.
-    void OnEvent(SDL_Event& event);
+    void WaitEvent();
 
     // Sets the window icon from yuzu.bmp
     void SetWindowIcon();
@@ -81,9 +80,6 @@ protected:
     /// Called when a configuration change affects the minimal size of the window
     void OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) override;
 
-    /// Periodic changer of titlebar (independent of event loop)
-    SDL_TimerID titlebar_timer;
-
     /// Is the window still open?
     bool is_open = true;
 
@@ -93,6 +89,9 @@ protected:
     /// Internal SDL3 render window
     SDL_Window* render_window{};
 
+    /// Keeps track of how often to update the title bar during gameplay
+    u32 last_time = 0;
+
     /// Input subsystem to use with this window.
     InputCommon::InputSubsystem* input_subsystem;
 

src/yuzu_cmd/yuzu.cpp

@@ -8,12 +8,6 @@
 #include <memory>
 #include <regex>
 #include <string>
-#include "common/settings_enums.h"
-#ifdef __EMSCRIPTEN__
-#include <emscripten.h>
-#endif
-#define SDL_MAIN_USE_CALLBACKS 1
-#include <SDL3/SDL_main.h>
 
 #include <fmt/ostream.h>
 
@@ -45,7 +39,9 @@
 #ifdef _WIN32
 // windows.h needs to be included before shellapi.h
 #include <windows.h>
+
 #include <shellapi.h>
+
 #include "common/windows/timer_resolution.h"
 #endif
 
@@ -178,14 +174,8 @@ static void OnStatusMessageReceived(const Network::StatusMessageEntry& msg) {
         std::cout << std::endl << "* " << message << std::endl << std::endl;
 }
 
-struct SdlState {
-    Core::System system{};
-    std::unique_ptr<EmuWindow_SDL3> emu_window;
-};
-
-extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
-    SdlState* state = new SdlState();
-
+/// Application entry point
+int main(int argc, char** argv) {
 #ifdef _WIN32
     if (AttachConsole(ATTACH_PARENT_PROCESS)) {
         freopen("CONOUT$", "wb", stdout);
@@ -203,7 +193,7 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
     auto argv_w = CommandLineToArgvW(GetCommandLineW(), &argc_w);
     if (argv_w == nullptr) {
         LOG_CRITICAL(Frontend, "Failed to get command line arguments");
-        return SDL_APP_FAILURE;
+        return -1;
     }
 #endif
     std::string filepath;
@@ -257,7 +247,7 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
                 break;
             case 'h':
                 PrintHelp(argv[0]);
-                return SDL_APP_FAILURE;
+                return 0;
             case 'g':
                 filepath = std::string(optarg);
                 break;
@@ -274,7 +264,7 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
                 if (!std::regex_match(str_arg, re)) {
                     std::cout << "Wrong format for option --multiplayer\n";
                     PrintHelp(argv[0]);
-                    return SDL_APP_FAILURE;
+                    return -1;
                 }
 
                 std::smatch match;
@@ -289,11 +279,11 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
                 std::regex nickname_re("^[a-zA-Z0-9._\\- ]+$");
                 if (!std::regex_match(nickname, nickname_re)) {
                     LOG_ERROR(Frontend, "Nickname is not valid. Must be 4 to 20 alphanumeric characters");
-                    return SDL_APP_FAILURE;
+                    return -1;
                 }
                 if (address.empty()) {
                     LOG_ERROR(Frontend, "Address to room must not be empty");
-                    return SDL_APP_FAILURE;
+                    return -1;
                 }
                 break;
             }
@@ -306,7 +296,7 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
                 break;
             case 'v':
                 PrintVersion();
-                return SDL_APP_FAILURE;
+                return -1;
             case 'n':
                 force_null_render = true;
                 break;
@@ -368,73 +358,79 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
 
     if (filepath.empty()) {
         LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified");
-        return SDL_APP_FAILURE;
+        return -1;
     }
 
-    state->system.Initialize();
+    Core::System system{};
+    system.Initialize();
 
     InputCommon::InputSubsystem input_subsystem{};
 
     // Apply the command line arguments
-    state->system.ApplySettings();
+    system.ApplySettings();
 
+    std::unique_ptr<EmuWindow_SDL3> emu_window;
     switch (Settings::values.renderer_backend.GetValue()) {
 #ifdef HAS_OPENGL
     case Settings::RendererBackend::OpenGL_GLSL:
     case Settings::RendererBackend::OpenGL_GLASM:
     case Settings::RendererBackend::OpenGL_SPIRV:
-        state->emu_window = std::make_unique<EmuWindow_SDL3_GL>(&input_subsystem, state->system, fullscreen);
+        emu_window = std::make_unique<EmuWindow_SDL3_GL>(&input_subsystem, system, fullscreen);
         break;
 #endif
     case Settings::RendererBackend::Vulkan:
-        state->emu_window = std::make_unique<EmuWindow_SDL3_VK>(&input_subsystem, state->system, fullscreen);
+        emu_window = std::make_unique<EmuWindow_SDL3_VK>(&input_subsystem, system, fullscreen);
         break;
     case Settings::RendererBackend::Null:
-        state->emu_window = std::make_unique<EmuWindow_SDL3_Null>(&input_subsystem, state->system, fullscreen);
+        emu_window = std::make_unique<EmuWindow_SDL3_Null>(&input_subsystem, system, fullscreen);
         break;
     default:
         LOG_CRITICAL(Frontend, "Invalid renderer backend");
-        return SDL_APP_FAILURE;
+        return -1;
     }
 
 #ifdef _WIN32
     Common::Windows::SetCurrentTimerResolutionToMaximum();
-    state->system.CoreTiming().SetTimerResolutionNs(Common::Windows::GetCurrentTimerResolution());
+    system.CoreTiming().SetTimerResolutionNs(Common::Windows::GetCurrentTimerResolution());
 #endif
 
-    state->system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
-    state->system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
-    state->system.GetFileSystemController().CreateFactories(*state->system.GetFilesystem());
-    state->system.GetUserChannel().clear();
+    system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
+    system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
+    system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
+    system.GetUserChannel().clear();
 
     Service::AM::FrontendAppletParameters load_parameters{
         .applet_id = Service::AM::AppletId::Application,
     };
-    const Core::SystemResultStatus load_result = state->system.Load(*state->emu_window, filepath, load_parameters);
+    const Core::SystemResultStatus load_result{system.Load(*emu_window, filepath, load_parameters)};
+
     switch (load_result) {
-    case Core::SystemResultStatus::Success:
-        break; // Expected case
     case Core::SystemResultStatus::ErrorGetLoader:
         LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filepath);
-        return SDL_APP_FAILURE;
+        return -1;
     case Core::SystemResultStatus::ErrorLoader:
         LOG_CRITICAL(Frontend, "Failed to load ROM!");
-        return SDL_APP_FAILURE;
+        return -1;
     case Core::SystemResultStatus::ErrorNotInitialized:
         LOG_CRITICAL(Frontend, "CPUCore not initialized");
-        return SDL_APP_FAILURE;
+        return -1;
     case Core::SystemResultStatus::ErrorVideoCore:
         LOG_CRITICAL(Frontend, "Failed to initialize VideoCore!");
-        return SDL_APP_FAILURE;
+        return -1;
+    case Core::SystemResultStatus::Success:
+        break; // Expected case
     default:
-        const u16 loader_id = u16(Core::SystemResultStatus::ErrorLoader);
-        const u16 error_id = u16(load_result) - loader_id;
-        LOG_CRITICAL(Frontend,
-            "While attempting to load the ROM requested, an error occurred. Please "
-            "refer to the Eden wiki for more information or the Eden discord for "
-            "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
-            loader_id, error_id, Loader::ResultStatus(error_id));
-        return SDL_APP_FAILURE;
+        if (static_cast<u32>(load_result) >
+            static_cast<u32>(Core::SystemResultStatus::ErrorLoader)) {
+            const u16 loader_id = static_cast<u16>(Core::SystemResultStatus::ErrorLoader);
+            const u16 error_id = static_cast<u16>(load_result) - loader_id;
+            LOG_CRITICAL(Frontend,
+                         "While attempting to load the ROM requested, an error occurred. Please "
+                         "refer to the Eden wiki for more information or the Eden discord for "
+                         "additional help.\n\nError Code: {:04X}-{:04X}\nError Description: {}",
+                         loader_id, error_id, static_cast<Loader::ResultStatus>(error_id));
+        }
+        break;
     }
 
     if (use_multiplayer) {
@@ -443,46 +439,40 @@ extern "C" SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
             member->BindOnStatusMessageReceived(OnStatusMessageReceived);
             member->BindOnStateChanged(OnStateChanged);
             member->BindOnError(OnNetworkError);
-            LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port, nickname);
+            LOG_DEBUG(Network, "Start connection to {}:{} with nickname {}", address, port,
+                      nickname);
             member->Join(nickname, address.c_str(), port, 0, Network::NoPreferredIP, password);
         } else {
             LOG_ERROR(Network, "Could not access RoomMember");
-            return SDL_APP_FAILURE;
+            return 0;
         }
     }
 
     // Core is loaded, start the GPU (makes the GPU contexts current to this thread)
-    state->system.GPU().Start();
-    state->system.GetCpuManager().OnGpuReady();
+    system.GPU().Start();
+    system.GetCpuManager().OnGpuReady();
 
     if (Settings::values.use_disk_shader_cache.GetValue()) {
-        state->system.Renderer().ReadRasterizer()->LoadDiskResources(
-            state->system.GetApplicationProcessProgramID(), std::stop_token{},
+        system.Renderer().ReadRasterizer()->LoadDiskResources(
+            system.GetApplicationProcessProgramID(), std::stop_token{},
             [](VideoCore::LoadCallbackStage, size_t value, size_t total) {});
     }
 
-    // don't do anything, SDL3 already exists for us :D
-    state->system.RegisterExitCallback([] {});
-    void(state->system.Run());
-    if (state->system.DebuggerEnabled())
-        state->system.InitializeDebugger();
-    return SDL_APP_SUCCESS;
-}
-extern "C" SDL_AppResult SDL_AppIterate(void *appstate) {
-    SdlState *state = (SdlState *)appstate;
-    return state->emu_window->IsOpen() ? SDL_APP_CONTINUE : SDL_APP_SUCCESS;
-}
-extern "C" SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) {
-    SdlState *state = (SdlState *)appstate;
-    state->emu_window->OnEvent(*event);
-    return SDL_APP_SUCCESS;
-}
-extern "C" void SDL_AppQuit(void *appstate, SDL_AppResult result) {
-    SdlState *state = (SdlState *)appstate;
-    state->system.DetachDebugger();
-    void(state->system.Pause());
-    state->system.ShutdownMainProcess();
-    delete state;
+    system.RegisterExitCallback([&] {
+        // Just exit right away.
+        exit(0);
+    });
+    void(system.Run());
+    if (system.DebuggerEnabled()) {
+        system.InitializeDebugger();
+    }
+    while (emu_window->IsOpen()) {
+        emu_window->WaitEvent();
+    }
+    system.DetachDebugger();
+    void(system.Pause());
+    system.ShutdownMainProcess();
+    return 0;
 }
 
 #define VMA_IMPLEMENTATION