evil noperm

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

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
@@ -645,71 +607,6 @@ abstract class SettingsItem(
                     valuesId = R.array.rendererAntiAliasingValues
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN,
-                    titleId = R.string.frame_gen,
-                    descriptionId = R.string.frame_gen_description
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_MULTIPLIER,
-                    titleId = R.string.frame_gen_multiplier,
-                    descriptionId = R.string.frame_gen_multiplier_description,
-                    choicesId = R.array.frameGenMultiplierNames,
-                    valuesId = R.array.frameGenMultiplierValues
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_TARGET_RATE,
-                    titleId = R.string.frame_gen_target_rate,
-                    descriptionId = R.string.frame_gen_target_rate_description,
-                    choicesId = R.array.frameGenTargetRateNames,
-                    valuesId = R.array.frameGenTargetRateValues
-                )
-            )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_FRAME_GEN_QUEUE_TARGET,
-                    titleId = R.string.frame_gen_queue_target,
-                    descriptionId = R.string.frame_gen_queue_target_description,
-                    choicesId = R.array.frameGenQueueTargetNames,
-                    valuesId = R.array.frameGenQueueTargetValues
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN_FLOW_SCALE_AUTO,
-                    titleId = R.string.frame_gen_flow_scale_auto,
-                    descriptionId = R.string.frame_gen_flow_scale_auto_description
-                )
-            )
-            put(
-                SliderSetting(
-                    IntSetting.RENDERER_FRAME_GEN_FLOW_SCALE,
-                    titleId = R.string.frame_gen_flow_scale,
-                    descriptionId = R.string.frame_gen_flow_scale_description,
-                    min = 25,
-                    max = 100,
-                    units = "%"
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN_FP16,
-                    titleId = R.string.frame_gen_fp16,
-                    descriptionId = R.string.frame_gen_fp16_description
-                )
-            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RENDERER_FRAME_GEN_DUMP_FLOW,
-                    titleId = R.string.frame_gen_dump_flow,
-                    descriptionId = R.string.frame_gen_dump_flow_description
-                )
-            )
             put(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_SCREEN_LAYOUT,

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

@@ -108,7 +108,6 @@ add_library(
     settings_input.h
     settings_setting.h
     slot_vector.h
-    socket_types.h
     spin_lock.h
     stb.cpp
     stb.h

src/common/announce_multiplayer_room.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 #include "common/common_types.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "web_service/web_result.h"
 
 namespace AnnounceMultiplayerRoom {

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/common/socket_types.h

@@ -1,178 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <optional>
-#include <string>
-
-#include "common/common_types.h"
-
-namespace Network {
-
-/// Address families
-enum class Domain : u8 {
-    Unspecified, ///< Represents 0, used in getaddrinfo hints
-    INET,        ///< Address family for IPv4
-};
-
-/// Socket types
-enum class Type {
-    Unspecified, ///< Represents 0, used in getaddrinfo hints
-    STREAM,
-    DGRAM,
-    RAW,
-    SEQPACKET,
-};
-
-/// Protocol values for sockets
-enum class Protocol : u8 {
-    Unspecified, ///< Represents 0, usable in various places
-    IP,
-    ICMP,
-    TCP,
-    UDP,
-    IPV6,
-    RAW,
-    IGMP,
-    GGP,
-    IPV4,
-    ST,
-    EGP,
-    PIGP,
-    RCCMON,
-    NVPII,
-    PUP,
-    ARGUS,
-    EMCON,
-    XNET,
-    CHAOS,
-    MUX,
-    MEAS,
-    HMP,
-    PRM,
-    IDP,
-    TRUNK1,
-    TRUNK2,
-    LEAF1,
-    LEAF2,
-    RDP,
-    IRTP,
-    TP,
-    BLT,
-    NSP,
-    INP,
-    DCCP,
-    //TODO: 3PC,
-    IDPR,
-    XTP,
-    DDP,
-    CMTP,
-    TPXX,
-    IL,
-    SDRP,
-    ROUTING,
-    FRAGMENT,
-    IDRP,
-    RSVP,
-    GRE,
-    MHRP,
-    BHA,
-    ESP,
-    AH,
-    INLSP,
-    SWIPE,
-    NHRP,
-    MOBILE,
-    TLSP,
-    SKIP,
-    ICMPV6,
-    NONE,
-    DSTOPTS,
-    AHIP,
-    CFTP,
-    HELLO,
-    SATEXPAK,
-    KRYPTOLAN,
-    RVD,
-    IPPC,
-    ADFS,
-    SATMON,
-    VISA,
-    IPCV,
-    CPNX,
-    CPHB,
-    WSN,
-    PVP,
-    BRSATMON,
-    ND,
-    WBMON,
-    WBEXPAK,
-    EON,
-    VMTP,
-    SVMTP,
-    VINES,
-    TTP,
-    IGP,
-    DGP,
-    TCF,
-    IGRP,
-    OSPFIGP,
-    SRPC,
-    LARP,
-    MTP,
-    AX25,
-    IPEIP,
-    MICP,
-    SCCSP,
-    ETHERIP,
-    ENCAP,
-    APES,
-    GMTP,
-    IPCOMP,
-    SCTP,
-    MH,
-    UDPLITE,
-    HIP,
-    SHIM6,
-    PIM,
-    CARP,
-    PGM,
-    MPLS,
-    PFSYNC
-};
-
-/// Shutdown mode
-enum class ShutdownHow {
-    RD,
-    WR,
-    RDWR,
-};
-
-/// Array of IPv4 address
-using IPv4Address = std::array<u8, 4>;
-
-/// Cross-platform sockaddr structure
-struct SockAddrIn {
-    Domain family;
-    IPv4Address ip;
-    u16 portno;
-};
-
-constexpr u32 FLAG_MSG_PEEK = 0x2;
-constexpr u32 FLAG_MSG_DONTWAIT = 0x80;
-constexpr u32 FLAG_O_NONBLOCK = 0x800;
-
-/// Cross-platform addrinfo structure
-struct AddrInfo {
-    Domain family;
-    Type socket_type;
-    Protocol protocol;
-    SockAddrIn addr;
-    std::optional<std::string> canon_name;
-};
-
-} // namespace Network

src/core/CMakeLists.txt

@@ -1133,6 +1133,7 @@ add_library(core STATIC
     internal_network/network_interface.h
     internal_network/socket_proxy.cpp
     internal_network/socket_proxy.h
+    internal_network/socket_types.h
     internal_network/sockets.h
     internal_network/wifi_scanner.h
     launch_timestamp_cache.cpp
@@ -1171,6 +1172,12 @@ add_library(core STATIC
     tools/renderdoc.cpp
     tools/renderdoc.h)
 
+if (UNIX AND NOT APPLE)
+    target_sources(core PRIVATE
+        internal_network/socket_icmp.cpp
+        internal_network/socket_icmp.h)
+endif()
+
 if (ENABLE_WIFI_SCAN)
     target_sources(core PRIVATE internal_network/wifi_scanner.cpp)
     if (LINUX)

src/core/hle/service/ldn/lan_discovery.h

@@ -18,7 +18,7 @@
 #include <ankerl/unordered_dense.h>
 
 #include "common/logging.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "core/hle/result.h"
 #include "core/hle/service/ldn/ldn_results.h"
 #include "core/hle/service/ldn/ldn_types.h"

src/core/hle/service/server_manager.cpp

@@ -129,6 +129,13 @@ ServerManager::~ServerManager() {
     }
 }
 
+void ServerManager::StartAdditionalHostThreads(const char* name, size_t num_threads) {
+    for (size_t i = 0; i < num_threads; i++) {
+        auto thread_name = fmt::format("{}:{}", name, i + 1);
+        m_threads.emplace_back(m_system.Kernel().RunOnHostCoreThread(std::move(thread_name), [&] { this->LoopProcessImpl(); }));
+    }
+}
+
 void ServerManager::RunServer(std::unique_ptr<ServerManager>&& server_manager) {
     server_manager->m_system.RunServer(std::move(server_manager));
 }
@@ -245,14 +252,6 @@ Result ServerManager::ManageDeferral(Kernel::KEvent** out_event) {
     R_SUCCEED();
 }
 
-void ServerManager::StartAdditionalHostThreads(const char* name, size_t num_threads) {
-    for (size_t i = 0; i < num_threads; i++) {
-        auto thread_name = fmt::format("{}:{}", name, i + 1);
-        m_threads.emplace_back(m_system.Kernel().RunOnHostCoreThread(
-            std::move(thread_name), [&] { this->LoopProcessImpl(); }));
-    }
-}
-
 Result ServerManager::LoopProcess() {
     SCOPE_EXIT {
         m_stopped.Set();

src/core/hle/service/server_manager.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -48,8 +51,8 @@ public:
     Result ManageDeferral(Kernel::KEvent** out_event);
 
     Result LoopProcess();
-    void StartAdditionalHostThreads(const char* name, size_t num_threads);
 
+    void StartAdditionalHostThreads(const char* name, size_t num_threads);
     static void RunServer(std::unique_ptr<ServerManager>&& server);
 
 private:

src/core/hle/service/sockets/bsd.cpp

@@ -12,7 +12,7 @@
 #include <fmt/ranges.h>
 
 #include "common/logging.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "core/core.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/service/ipc_helpers.h"
@@ -20,6 +20,9 @@
 #include "core/hle/service/sockets/sockets_translate.h"
 #include "core/internal_network/network.h"
 #include "core/internal_network/socket_proxy.h"
+#if defined(__unix__) && !defined(__APPLE__)
+#include "core/internal_network/socket_icmp.h"
+#endif
 #include "core/internal_network/sockets.h"
 #include "network/network.h"
 #include <common/settings.h>
@@ -28,14 +31,15 @@ namespace Service::Sockets {
 
 namespace {
 
-bool IsConnectionBased(Type type) {
+[[nodiscard]] bool IsConnectionBased(Network::Type type) noexcept {
     switch (type) {
-    case Type::STREAM:
+    case Network::Type::STREAM:
+    case Network::Type::SEQPACKET:
+    case Network::Type::RAW:
         return true;
-    case Type::DGRAM:
-        return false;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented type={}", type);
+    case Network::Type::DGRAM:
+    case Network::Type::RDM:
+    case Network::Type::Unspecified:
         return false;
     }
 }
@@ -92,7 +96,7 @@ void BSD::ConnectWork::Execute(BSD* bsd) {
 void BSD::ConnectWork::Response(HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
-    rb.Push<s32>(bsd_errno == Errno::SUCCESS ? 0 : -1);
+    rb.Push<s32>(bsd_errno == Network::Errno::E_SUCCESS ? 0 : -1);
     rb.PushEnum(bsd_errno);
 }
 
@@ -170,12 +174,8 @@ void BSD::Socket(HLERequestContext& ctx) {
     const u32 domain = rp.Pop<u32>();
     const u32 type = rp.Pop<u32>();
     const u32 protocol = rp.Pop<u32>();
-
     LOG_DEBUG(Service, "called. domain={} type={} protocol={}", domain, type, protocol);
-
-    const auto [fd, bsd_errno] = SocketImpl(static_cast<Domain>(domain), static_cast<Type>(type),
-                                            static_cast<Protocol>(protocol));
-
+    const auto [fd, bsd_errno] = SocketImpl(Network::Domain(domain), Network::Type(type), Network::Protocol(protocol));
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
     rb.Push<s32>(fd);
@@ -246,13 +246,13 @@ void BSD::GetPeerName(HLERequestContext& ctx) {
     LOG_DEBUG(Service, "called. fd={}", fd);
 
     std::vector<u8> write_buffer(ctx.GetWriteBufferSize());
-    const Errno bsd_errno = GetPeerNameImpl(fd, write_buffer);
+    const Network::Errno bsd_errno = GetPeerNameImpl(fd, write_buffer);
 
     ctx.WriteBuffer(write_buffer);
 
     IPC::ResponseBuilder rb{ctx, 5};
     rb.Push(ResultSuccess);
-    rb.Push<s32>(bsd_errno != Errno::SUCCESS ? -1 : 0);
+    rb.Push<s32>(bsd_errno != Network::Errno::E_SUCCESS ? -1 : 0);
     rb.PushEnum(bsd_errno);
     rb.Push<u32>(static_cast<u32>(write_buffer.size()));
 }
@@ -264,13 +264,13 @@ void BSD::GetSockName(HLERequestContext& ctx) {
     LOG_DEBUG(Service, "called. fd={}", fd);
 
     std::vector<u8> write_buffer(ctx.GetWriteBufferSize());
-    const Errno bsd_errno = GetSockNameImpl(fd, write_buffer);
+    const Network::Errno bsd_errno = GetSockNameImpl(fd, write_buffer);
 
     ctx.WriteBuffer(write_buffer);
 
     IPC::ResponseBuilder rb{ctx, 5};
     rb.Push(ResultSuccess);
-    rb.Push<s32>(bsd_errno != Errno::SUCCESS ? -1 : 0);
+    rb.Push<s32>(bsd_errno != Network::Errno::E_SUCCESS ? -1 : 0);
     rb.PushEnum(bsd_errno);
     rb.Push<u32>(static_cast<u32>(write_buffer.size()));
 }
@@ -278,21 +278,19 @@ void BSD::GetSockName(HLERequestContext& ctx) {
 void BSD::GetSockOpt(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const s32 fd = rp.Pop<s32>();
-    const u32 level = rp.Pop<u32>();
-    const auto optname = static_cast<OptName>(rp.Pop<u32>());
+    const auto level = Network::SocketLevel(rp.Pop<u32>());
+    const auto optname = Network::OptName(rp.Pop<u32>());
 
     std::vector<u8> optval(ctx.GetWriteBufferSize());
 
-    LOG_DEBUG(Service, "called. fd={} level={} optname={:#x} len={:#x}", fd, level, optname,
-              optval.size());
-
-    const Errno err = GetSockOptImpl(fd, level, optname, optval);
+    LOG_DEBUG(Service, "called. fd={} level={} optname={:#x} len={:#x}", fd, level, optname, optval.size());
+    const Network::Errno err = GetSockOptImpl(fd, level, optname, optval);
 
     ctx.WriteBuffer(optval);
 
     IPC::ResponseBuilder rb{ctx, 5};
     rb.Push(ResultSuccess);
-    rb.Push<s32>(err == Errno::SUCCESS ? 0 : -1);
+    rb.Push<s32>(err == Network::Errno::E_SUCCESS ? 0 : -1);
     rb.PushEnum(err);
     rb.Push<u32>(static_cast<u32>(optval.size()));
 }
@@ -315,7 +313,7 @@ void BSD::Fcntl(HLERequestContext& ctx) {
 
     LOG_DEBUG(Service, "called. fd={} cmd={} arg={}", fd, cmd, arg);
 
-    const auto [ret, bsd_errno] = FcntlImpl(fd, static_cast<FcntlCmd>(cmd), arg);
+    const auto [ret, bsd_errno] = FcntlImpl(fd, Network::FcntlCmd(cmd), arg);
 
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
@@ -327,13 +325,11 @@ void BSD::SetSockOpt(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
 
     const s32 fd = rp.Pop<s32>();
-    const u32 level = rp.Pop<u32>();
-    const OptName optname = static_cast<OptName>(rp.Pop<u32>());
+    const Network::SocketLevel level = Network::SocketLevel(rp.Pop<u32>());
+    const Network::OptName optname = Network::OptName(rp.Pop<u32>());
     const auto optval = ctx.ReadBuffer();
 
-    LOG_DEBUG(Service, "called. fd={} level={} optname={:#x} optlen={}", fd, level,
-              static_cast<u32>(optname), optval.size());
-
+    LOG_DEBUG(Service, "called. fd={} level={} optname={:#x} optlen={}", fd, level, u32(optname), optval.size());
     BuildErrnoResponse(ctx, SetSockOptImpl(fd, level, optname, optval));
 }
 
@@ -454,7 +450,7 @@ void BSD::DuplicateSocket(HLERequestContext& ctx) {
 
     struct OutputParameters {
         s32 ret;
-        Errno bsd_errno;
+        Network::Errno bsd_errno;
     };
     static_assert(sizeof(OutputParameters) == 0x8);
 
@@ -468,10 +464,10 @@ void BSD::DuplicateSocket(HLERequestContext& ctx) {
     if (auto* res = std::get_if<s32>(&res_v)) {
         rb.PushRaw(OutputParameters{
             .ret = *res,
-            .bsd_errno = Errno::SUCCESS,
+            .bsd_errno = Network::Errno::E_SUCCESS,
         });
     } else {
-        auto* err = std::get_if<Errno>(&res_v);
+        auto* err = std::get_if<Network::Errno>(&res_v);
         rb.PushRaw(OutputParameters{
             .ret = 0,
             .bsd_errno = *err,
@@ -486,7 +482,7 @@ void BSD::EventFd(HLERequestContext& ctx) {
 
     LOG_WARNING(Service, "(STUBBED) called. initval={}, flags={}", initval, flags);
 
-    BuildErrnoResponse(ctx, Errno::SUCCESS);
+    BuildErrnoResponse(ctx, Network::Errno::E_SUCCESS);
 }
 
 template <typename Work>
@@ -495,130 +491,134 @@ void BSD::ExecuteWork(HLERequestContext& ctx, Work work) {
     work.Response(ctx);
 }
 
-std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protocol) {
+std::pair<s32, Network::Errno> BSD::SocketImpl(Network::Domain domain, Network::Type type, Network::Protocol protocol) {
+    LOG_DEBUG(Network, "domain={},type={},protocol={}", u32(domain), u32(type), u32(protocol));
 
-    if (type == Type::SEQPACKET) {
-        UNIMPLEMENTED_MSG("SOCK_SEQPACKET errno management");
-    } else if (type == Type::RAW && (domain != Domain::INET || protocol != Protocol::ICMP)) {
-        UNIMPLEMENTED_MSG("SOCK_RAW errno management");
-    }
-
-    [[maybe_unused]] const bool unk_flag = (static_cast<u32>(type) & 0x20000000) != 0;
+    [[maybe_unused]] const bool unk_flag = (u32(type) & 0x20000000) != 0;
     UNIMPLEMENTED_IF_MSG(unk_flag, "Unknown flag in type");
-    type = static_cast<Type>(static_cast<u32>(type) & ~0x20000000);
+    type = Network::Type(u32(type) & ~0x20000000);
 
     const s32 fd = FindFreeFileDescriptorHandle();
     if (fd < 0) {
         LOG_ERROR(Service, "No more file descriptors available");
-        return {-1, Errno::MFILE};
+        return {-1, Network::Errno::E_MFILE};
+    }
+
+    if (Settings::values.airplane_mode.GetValue() && IsConnectionBased(type)) {
+        LOG_ERROR(Service, "Airplane mode is enabled, cannot create socket");
+        file_descriptors[fd].reset();
+        return {-1, Network::Errno::E_NOTCONN};
     }
 
     file_descriptors[fd] = FileDescriptor{};
     FileDescriptor& descriptor = *file_descriptors[fd];
+
     // ENONMEM might be thrown here
+    LOG_INFO(Service, "New socket fd={},domain={},type={},prot={}", fd, domain, type, protocol);
 
-    LOG_INFO(Service, "New socket fd={}", fd);
-
+    // While room is important -- we need to remember ICMP takes priority over **everything else**
+    // TODO: rework this so proxy sockets can be done transparently? -- like what if i need
+    // to browse the internet while playing LDN or something stupid like that?
     auto room_member = Network::GetRoomMember().lock();
-    if (room_member && room_member->IsConnected()) {
+    if ((protocol != Network::Protocol::ICMP && protocol != Network::Protocol::ICMPV6)
+    && (room_member && room_member->IsConnected())) {
         descriptor.socket = std::make_shared<Network::ProxySocket>();
     } else {
         descriptor.socket = std::make_shared<Network::Socket>();
     }
+    auto const bsd_errno = descriptor.socket->Initialize(domain, type, protocol);
 
-    descriptor.socket->Initialize(Translate(domain), Translate(type), Translate(protocol));
-    descriptor.is_connection_based = IsConnectionBased(type);
-
-    if (Settings::values.airplane_mode.GetValue() && descriptor.is_connection_based) {
-        LOG_ERROR(Service, "Airplane mode is enabled, cannot create socket");
-        return {-1, Errno::NOTCONN};
+#if defined(__unix__) && !defined(__APPLE__)
+    // ...only unix has this issue it seems, ICMP works otherwise fine on win
+    if (bsd_errno != Network::Errno::E_SUCCESS
+    && (protocol == Network::Protocol::ICMP || protocol == Network::Protocol::ICMPV6)) {
+        LOG_WARNING(Network, "Using ICMP emulated socket");
+        descriptor.socket = std::make_shared<Network::IcmpSocket>();
     }
+#endif
 
-    return {fd, Errno::SUCCESS};
+    descriptor.is_connection_based = IsConnectionBased(type);
+#ifdef _WIN32
+    if (descriptor.is_connection_based && descriptor.socket->fd == INVALID_SOCKET) {
+#else
+    if (descriptor.is_connection_based && descriptor.socket->fd == Network::Socket::INVALID_SOCKET) {
+#endif
+        file_descriptors[fd].reset();
+        return {-1, bsd_errno};
+    }
+    return {fd, Network::Errno::E_SUCCESS};
 }
 
-std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer,
-                                    s32 nfds, s32 timeout) {
+std::pair<s32, Network::Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer, s32 nfds, s32 timeout) {
+    LOG_DEBUG(Network, "nfds={},timeout={}", nfds, timeout);
     if (nfds <= 0) {
         // When no entries are provided, -1 is returned with errno zero
-        return {-1, Errno::SUCCESS};
+        return {-1, Network::Errno::E_SUCCESS};
     }
-    if (read_buffer.size() < nfds * sizeof(PollFD)) {
-        return {-1, Errno::INVAL};
+    if (read_buffer.size() < nfds * sizeof(Network::PollFD)) {
+        return {-1, Network::Errno::E_INVAL};
     }
-    if (write_buffer.size() < nfds * sizeof(PollFD)) {
-        return {-1, Errno::INVAL};
+    if (write_buffer.size() < nfds * sizeof(Network::PollFD)) {
+        return {-1, Network::Errno::E_INVAL};
     }
 
-    std::vector<PollFD> fds(nfds);
-    std::memcpy(fds.data(), read_buffer.data(), nfds * sizeof(PollFD));
+    std::span<const Network::PollFD> in_fds(reinterpret_cast<const Network::PollFD*>(read_buffer.data()), nfds);
+    std::span<Network::PollFD> out_fds(reinterpret_cast<Network::PollFD*>(write_buffer.data()), nfds);
+    std::copy(in_fds.begin(), in_fds.end(), out_fds.begin());
 
     if (timeout >= 0) {
         const s64 seconds = timeout / 1000;
-        const u64 nanoseconds = 1'000'000 * (static_cast<u64>(timeout) % 1000);
-
+        const u64 nanoseconds = 1'000'000 * (u64(timeout) % 1000);
         if (seconds < 0) {
-            return {-1, Errno::INVAL};
+            return {-1, Network::Errno::E_INVAL};
         }
         if (nanoseconds > 999'999'999) {
-            return {-1, Errno::INVAL};
+            return {-1, Network::Errno::E_INVAL};
         }
     } else if (timeout != -1) {
-        return {-1, Errno::INVAL};
+        return {-1, Network::Errno::E_INVAL};
     }
 
-    for (PollFD& pollfd : fds) {
-        ASSERT(False(pollfd.revents));
-
-        if (pollfd.fd > static_cast<s32>(MAX_FD) || pollfd.fd < 0) {
-            LOG_ERROR(Service, "File descriptor handle={} is invalid", pollfd.fd);
-            pollfd.revents = PollEvents{};
-            return {0, Errno::SUCCESS};
-        }
-
-        const std::optional<FileDescriptor>& descriptor = file_descriptors[pollfd.fd];
-        if (!descriptor) {
-            LOG_TRACE(Service, "File descriptor handle={} is not allocated", pollfd.fd);
-            pollfd.revents = PollEvents::Nval;
-            return {0, Errno::SUCCESS};
+    for (size_t i = 0; i < in_fds.size(); ++i) {
+        ASSERT(out_fds[i].fd == in_fds[i].fd && False(in_fds[i].revents));
+        if (!IsFileDescriptorValid(in_fds[i].fd)) {
+            out_fds[i].revents = {};
+            if (!file_descriptors[in_fds[i].fd])
+                out_fds[i].revents = Network::PollEvents::NVAL;
+            return {0, Network::Errno::E_SUCCESS};
         }
     }
 
-    std::vector<Network::PollFD> host_pollfds(fds.size());
-    std::transform(fds.begin(), fds.end(), host_pollfds.begin(), [](PollFD pollfd) {
-        Network::PollFD result;
-        result.socket = file_descriptors[pollfd.fd]->socket.get();
-        result.events = Translate(pollfd.events);
-        result.revents = Network::PollEvents{};
+    std::vector<Network::HostPollFD> host_pollfds(in_fds.size());
+    std::transform(in_fds.begin(), in_fds.end(), host_pollfds.begin(), [](auto const e) {
+        Network::HostPollFD result{};
+        result.socket = file_descriptors[e.fd]->socket.get();
+        result.events = e.events;
+        result.revents = {};
         return result;
     });
-
-    const auto result = Network::Poll(host_pollfds, timeout);
-
-    const size_t num = host_pollfds.size();
-    for (size_t i = 0; i < num; ++i) {
-        fds[i].revents = Translate(host_pollfds[i].revents);
-    }
-    std::memcpy(write_buffer.data(), fds.data(), nfds * sizeof(PollFD));
-
-    return Translate(result);
+    auto const res = Network::Poll(host_pollfds, timeout);
+    for (size_t i = 0; i < in_fds.size(); ++i)
+        out_fds[i].revents = host_pollfds[i].revents;
+    return res;
 }
 
-std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
+std::pair<s32, Network::Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
 
     const s32 new_fd = FindFreeFileDescriptorHandle();
     if (new_fd < 0) {
         LOG_ERROR(Service, "No more file descriptors available");
-        return {-1, Errno::MFILE};
+        return {-1, Network::Errno::E_MFILE};
     }
 
     FileDescriptor& descriptor = *file_descriptors[fd];
     auto [result, bsd_errno] = descriptor.socket->Accept();
-    if (bsd_errno != Network::Errno::SUCCESS) {
-        return {-1, Translate(bsd_errno)};
+    if (bsd_errno != Network::Errno::E_SUCCESS) {
+        return {-1, bsd_errno};
     }
 
     file_descriptors[new_fd] = FileDescriptor{};
@@ -626,267 +626,218 @@ std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
     new_descriptor.socket = std::move(result.socket);
     new_descriptor.is_connection_based = descriptor.is_connection_based;
 
-    const SockAddrIn guest_addr_in = Translate(result.sockaddr_in);
-    PutValue(write_buffer, guest_addr_in);
-
-    return {new_fd, Errno::SUCCESS};
+    PutValue(write_buffer, result.sockaddr_in);
+    return {new_fd, Network::Errno::E_SUCCESS};
 }
 
-Errno BSD::BindImpl(s32 fd, std::span<const u8> addr) {
+Network::Errno BSD::BindImpl(s32 fd, std::span<const u8> addr) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
     ASSERT(addr.size() >= 16);
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
-    auto addr_in = GetValue<SockAddrIn>(addr);
-
-    return Translate(file_descriptors[fd]->socket->Bind(Translate(addr_in)));
+    auto addr_in = GetValue<Network::SockAddrIn>(addr);
+    return file_descriptors[fd]->socket->Bind(addr_in);
 }
 
-Errno BSD::ConnectImpl(s32 fd, std::span<const u8> addr) {
+Network::Errno BSD::ConnectImpl(s32 fd, std::span<const u8> addr) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
     ASSERT(addr.size() >= 16);
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
-    auto addr_in = GetValue<SockAddrIn>(addr);
-
-    const Errno result = Translate(file_descriptors[fd]->socket->Connect(Translate(addr_in)));
-
-    if (result == Errno::ISCONN) {
+    auto addr_in = GetValue<Network::SockAddrIn>(addr);
+    const Network::Errno result = file_descriptors[fd]->socket->Connect(addr_in);
+    if (result == Network::Errno::E_ISCONN) {
         LOG_DEBUG(Service, "returned ISCONN - socket already connected");
-        return Errno::SUCCESS;
+        return Network::Errno::E_SUCCESS;
     }
 
     return result;
 }
 
-Errno BSD::GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer) {
+Network::Errno BSD::GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
     const auto [addr_in, bsd_errno] = file_descriptors[fd]->socket->GetPeerName();
-    if (bsd_errno != Network::Errno::SUCCESS) {
-        return Translate(bsd_errno);
+    if (bsd_errno != Network::Errno::E_SUCCESS) {
+        return bsd_errno;
     }
-    const SockAddrIn guest_addrin = Translate(addr_in);
-
-    ASSERT(write_buffer.size() >= sizeof(guest_addrin));
-    write_buffer.resize(sizeof(guest_addrin));
-    PutValue(write_buffer, guest_addrin);
-    return Translate(bsd_errno);
+    ASSERT(write_buffer.size() >= addr_in.len);
+    write_buffer.resize(addr_in.len);
+    PutValue(write_buffer, addr_in);
+    return bsd_errno;
 }
 
-Errno BSD::GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer) {
+Network::Errno BSD::GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
     const auto [addr_in, bsd_errno] = file_descriptors[fd]->socket->GetSockName();
-    if (bsd_errno != Network::Errno::SUCCESS) {
-        return Translate(bsd_errno);
+    if (bsd_errno != Network::Errno::E_SUCCESS) {
+        return bsd_errno;
     }
-    const SockAddrIn guest_addrin = Translate(addr_in);
-
-    ASSERT(write_buffer.size() >= sizeof(guest_addrin));
-    write_buffer.resize(sizeof(guest_addrin));
-    PutValue(write_buffer, guest_addrin);
-    return Translate(bsd_errno);
+    ASSERT(write_buffer.size() >= addr_in.len);
+    write_buffer.resize(addr_in.len);
+    PutValue(write_buffer, addr_in);
+    return bsd_errno;
 }
 
-Errno BSD::ListenImpl(s32 fd, s32 backlog) {
+Network::Errno BSD::ListenImpl(s32 fd, s32 backlog) {
+    LOG_DEBUG(Network, "fd={},backlog={}", fd, backlog);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
-    return Translate(file_descriptors[fd]->socket->Listen(backlog));
+    return file_descriptors[fd]->socket->Listen(backlog);
 }
 
-std::pair<s32, Errno> BSD::FcntlImpl(s32 fd, FcntlCmd cmd, s32 arg) {
+std::pair<s32, Network::Errno> BSD::FcntlImpl(s32 fd, Network::FcntlCmd cmd, s32 arg) {
+    LOG_DEBUG(Network, "fd={},cmd={},arg={}", fd, u32(cmd), arg);
     if (!IsFileDescriptorValid(fd)) {
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
 
     FileDescriptor& descriptor = *file_descriptors[fd];
-
     switch (cmd) {
-    case FcntlCmd::GETFL:
+    case Network::FcntlCmd::GETFL:
         ASSERT(arg == 0);
-        return {descriptor.flags, Errno::SUCCESS};
-    case FcntlCmd::SETFL: {
-        const bool enable = (arg & Network::FLAG_O_NONBLOCK) != 0;
-        const Errno bsd_errno = Translate(descriptor.socket->SetNonBlock(enable));
-        if (bsd_errno != Errno::SUCCESS) {
+        return {descriptor.flags, Network::Errno::E_SUCCESS};
+    case Network::FcntlCmd::SETFL: {
+        const bool enable = (arg & u32(Network::FcntlFlags::NONBLOCK_NX)) != 0;
+        const Network::Errno bsd_errno = descriptor.socket->SetNonBlock(enable);
+        if (bsd_errno != Network::Errno::E_SUCCESS) {
             return {-1, bsd_errno};
         }
         descriptor.flags = arg;
-        return {0, Errno::SUCCESS};
+        return {0, Network::Errno::E_SUCCESS};
     }
     default:
         UNIMPLEMENTED_MSG("Unimplemented cmd={}", cmd);
-        return {-1, Errno::SUCCESS};
+        return {-1, Network::Errno::E_SUCCESS};
     }
 }
 
-Errno BSD::GetSockOptImpl(s32 fd, u32 level, OptName optname, std::vector<u8>& optval) {
+Network::Errno BSD::GetSockOptImpl(s32 fd, Network::SocketLevel level, Network::OptName optname, std::vector<u8>& optval) {
+    LOG_DEBUG(Network, "fd={},level={},optname={}", fd, u32(level), u32(optname));
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
-    if (level != static_cast<u32>(SocketLevel::SOCKET)) {
-        UNIMPLEMENTED_MSG("Unknown getsockopt level");
-        return Errno::SUCCESS;
+    if (level != Network::SocketLevel::SOCKET) {
+        LOG_WARNING(Service, "(stubbed) level fd={}, level={}, optname={}", fd, level, optname);
     }
 
     Network::SocketBase* const socket = file_descriptors[fd]->socket.get();
 
     switch (optname) {
-    case OptName::ERROR_: {
+    case Network::OptName::ERROR_: {
         auto [pending_err, getsockopt_err] = socket->GetPendingError();
-        if (getsockopt_err == Network::Errno::SUCCESS) {
-            Errno translated_pending_err = Translate(pending_err);
+        if (getsockopt_err == Network::Errno::E_SUCCESS) {
             ASSERT_OR_EXECUTE_MSG(
-                optval.size() == sizeof(Errno), { return Errno::INVAL; },
+                optval.size() == sizeof(Network::Errno), { return Network::Errno::E_INVAL; },
                 "Incorrect getsockopt option size");
-            optval.resize(sizeof(Errno));
-            PutValue(optval, translated_pending_err);
+            optval.resize(sizeof(Network::Errno));
+            PutValue(optval, pending_err);
         }
-        return Translate(getsockopt_err);
+        return getsockopt_err;
     }
     default:
         UNIMPLEMENTED_MSG("Unimplemented optname={}", optname);
-        return Errno::SUCCESS;
+        return Network::Errno::E_SUCCESS;
     }
 }
 
-Errno BSD::SetSockOptImpl(s32 fd, u32 level, OptName optname, std::span<const u8> optval) {
+Network::Errno BSD::SetSockOptImpl(s32 fd, Network::SocketLevel level, Network::OptName optname, std::span<const u8> optval) {
+    LOG_DEBUG(Service, "fd={},level={},optname={}", fd, level, optname);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
-    }
-
-    if (level != static_cast<u32>(SocketLevel::SOCKET)) {
-        LOG_WARNING(Service, "(STUBBED) setsockopt with level={}, optname={}", level, optname);
-        return Errno::SUCCESS;
+        return Network::Errno::E_BADF;
     }
 
     Network::SocketBase* const socket = file_descriptors[fd]->socket.get();
-
-    if (optname == OptName::LINGER) {
-        ASSERT(optval.size() == sizeof(Linger));
-        auto linger = GetValue<Linger>(optval);
-        ASSERT(linger.onoff == 0 || linger.onoff == 1);
-
-        return Translate(socket->SetLinger(linger.onoff != 0, linger.linger));
-    }
-
-    ASSERT(optval.size() == sizeof(u32));
-    auto value = GetValue<u32>(optval);
-
-    switch (optname) {
-    case OptName::REUSEADDR:
-        ASSERT(value == 0 || value == 1);
-        return Translate(socket->SetReuseAddr(value != 0));
-    case OptName::KEEPALIVE:
-        ASSERT(value == 0 || value == 1);
-        return Translate(socket->SetKeepAlive(value != 0));
-    case OptName::BROADCAST:
-        ASSERT(value == 0 || value == 1);
-        return Translate(socket->SetBroadcast(value != 0));
-    case OptName::SNDBUF:
-        return Translate(socket->SetSndBuf(value));
-    case OptName::RCVBUF:
-        return Translate(socket->SetRcvBuf(value));
-    case OptName::SNDTIMEO:
-        return Translate(socket->SetSndTimeo(value));
-    case OptName::RCVTIMEO:
-        return Translate(socket->SetRcvTimeo(value));
-    case OptName::NOSIGPIPE:
-        LOG_WARNING(Service, "(STUBBED) setting NOSIGPIPE to {}", value);
-        return Errno::SUCCESS;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented optname={}", optname);
-        return Errno::SUCCESS;
-    }
+    return socket->SetSockOpt(level, optname, optval);
 }
 
-Errno BSD::ShutdownImpl(s32 fd, s32 how) {
+Network::Errno BSD::ShutdownImpl(s32 fd, s32 how) {
+    LOG_DEBUG(Network, "fd={},how={}", fd, how);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
-    const Network::ShutdownHow host_how = Translate(static_cast<ShutdownHow>(how));
-    return Translate(file_descriptors[fd]->socket->Shutdown(host_how));
+    return file_descriptors[fd]->socket->Shutdown(Network::ShutdownHow(how));
 }
 
-std::pair<s32, Errno> BSD::RecvImpl(s32 fd, u32 flags, std::vector<u8>& message) {
+std::pair<s32, Network::Errno> BSD::RecvImpl(s32 fd, u32 flags, std::vector<u8>& message) {
+    LOG_DEBUG(Network, "fd={},flags={}", fd, flags);
     if (!IsFileDescriptorValid(fd)) {
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
 
     FileDescriptor& descriptor = *file_descriptors[fd];
 
     // Apply flags
-    using Network::FLAG_MSG_DONTWAIT;
-    using Network::FLAG_O_NONBLOCK;
-    if ((flags & FLAG_MSG_DONTWAIT) != 0) {
-        flags &= ~FLAG_MSG_DONTWAIT;
-        if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) {
+    if ((flags & u32(Network::MsgOpt::DONTWAIT)) != 0) {
+        flags &= ~u32(Network::MsgOpt::DONTWAIT);
+        if ((descriptor.flags & u32(Network::FcntlFlags::NONBLOCK_NX)) == 0) {
             descriptor.socket->SetNonBlock(true);
         }
     }
 
-    const auto [ret, bsd_errno] = Translate(descriptor.socket->Recv(flags, message));
-
+    const auto [ret, bsd_errno] = descriptor.socket->Recv(flags, message);
     // Restore original state
-    if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) {
+    if ((descriptor.flags & u32(Network::FcntlFlags::NONBLOCK_NX)) == 0)
         descriptor.socket->SetNonBlock(false);
-    }
-
     return {ret, bsd_errno};
 }
 
-std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message,
-                                        std::vector<u8>& addr) {
+std::pair<s32, Network::Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message, std::vector<u8>& addr) {
+    LOG_DEBUG(Network, "fd={},flags={}", fd, flags);
     if (!IsFileDescriptorValid(fd)) {
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
 
     FileDescriptor& descriptor = *file_descriptors[fd];
@@ -901,19 +852,17 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& mess
     }
 
     // Apply flags
-    using Network::FLAG_MSG_DONTWAIT;
-    using Network::FLAG_O_NONBLOCK;
-    if ((flags & FLAG_MSG_DONTWAIT) != 0) {
-        flags &= ~FLAG_MSG_DONTWAIT;
-        if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) {
+    if ((flags & u32(Network::MsgOpt::DONTWAIT)) != 0) {
+        flags &= ~u32(Network::MsgOpt::DONTWAIT);
+        if ((descriptor.flags & u32(Network::FcntlFlags::NONBLOCK_NX)) == 0) {
             descriptor.socket->SetNonBlock(true);
         }
     }
 
-    const auto [ret, bsd_errno] = Translate(descriptor.socket->RecvFrom(flags, message, p_addr_in));
+    const auto [ret, bsd_errno] = descriptor.socket->RecvFrom(flags, message, p_addr_in);
 
     // Restore original state
-    if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) {
+    if ((descriptor.flags & u32(Network::FcntlFlags::NONBLOCK_NX)) == 0) {
         descriptor.socket->SetNonBlock(false);
     }
 
@@ -922,58 +871,59 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& mess
             addr.clear();
         } else {
             ASSERT(addr.size() >= 16);
-            const SockAddrIn result = Translate(addr_in);
-            PutValue(addr, result);
+            PutValue(addr, addr_in);
         }
     }
 
     return {ret, bsd_errno};
 }
 
-std::pair<s32, Errno> BSD::SendImpl(s32 fd, u32 flags, std::span<const u8> message) {
+std::pair<s32, Network::Errno> BSD::SendImpl(s32 fd, u32 flags, std::span<const u8> message) {
+    LOG_DEBUG(Network, "fd={},flags={}", fd, flags);
     if (!IsFileDescriptorValid(fd)) {
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
-    return Translate(file_descriptors[fd]->socket->Send(message, flags));
+    return file_descriptors[fd]->socket->Send(message, flags);
 }
 
-std::pair<s32, Errno> BSD::SendToImpl(s32 fd, u32 flags, std::span<const u8> message,
-                                      std::span<const u8> addr) {
+std::pair<s32, Network::Errno> BSD::SendToImpl(s32 fd, u32 flags, std::span<const u8> message, std::span<const u8> addr) {
+    LOG_DEBUG(Network, "fd={},flags={}", fd, flags);
     if (!IsFileDescriptorValid(fd)) {
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return {-1, Errno::BADF};
+        return {-1, Network::Errno::E_BADF};
     }
 
-    Network::SockAddrIn addr_in;
+    Network::SockAddrIn addr_in{};
     Network::SockAddrIn* p_addr_in = nullptr;
     if (!addr.empty()) {
         ASSERT(addr.size() >= 16);
-        auto guest_addr_in = GetValue<SockAddrIn>(addr);
-        addr_in = Translate(guest_addr_in);
+        auto guest_addr_in = GetValue<Network::SockAddrIn>(addr);
+        addr_in = guest_addr_in;
         p_addr_in = &addr_in;
     }
 
-    return Translate(file_descriptors[fd]->socket->SendTo(flags, message, p_addr_in));
+    return file_descriptors[fd]->socket->SendTo(flags, message, p_addr_in);
 }
 
-Errno BSD::CloseImpl(s32 fd) {
+Network::Errno BSD::CloseImpl(s32 fd) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
     if (!file_descriptors[fd]->socket) {
         LOG_WARNING(Service, "Uninitialized socket");
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
-    const Errno bsd_errno = Translate(file_descriptors[fd]->socket->Close());
-    if (bsd_errno != Errno::SUCCESS) {
+    auto const bsd_errno = file_descriptors[fd]->socket->Close();
+    if (bsd_errno != Network::Errno::E_SUCCESS) {
         return bsd_errno;
     }
 
@@ -983,15 +933,16 @@ Errno BSD::CloseImpl(s32 fd) {
     return bsd_errno;
 }
 
-std::variant<s32, Errno> BSD::DuplicateSocketImpl(s32 fd) {
+std::variant<s32, Network::Errno> BSD::DuplicateSocketImpl(s32 fd) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Network::Errno::E_BADF;
     }
 
     const s32 new_fd = FindFreeFileDescriptorHandle();
-    if (new_fd < 0) {
+    if (!IsFileDescriptorValid(new_fd)) {
         LOG_ERROR(Service, "No more file descriptors available");
-        return Errno::MFILE;
+        return Network::Errno::E_MFILE;
     }
 
     file_descriptors[new_fd] = FileDescriptor{
@@ -1003,6 +954,7 @@ std::variant<s32, Errno> BSD::DuplicateSocketImpl(s32 fd) {
 }
 
 std::optional<std::shared_ptr<Network::SocketBase>> BSD::GetSocket(s32 fd) {
+    LOG_DEBUG(Network, "fd={}", fd);
     if (!IsFileDescriptorValid(fd)) {
         return std::nullopt;
     }
@@ -1014,41 +966,40 @@ std::optional<std::shared_ptr<Network::SocketBase>> BSD::GetSocket(s32 fd) {
 }
 
 s32 BSD::FindFreeFileDescriptorHandle() noexcept {
-    for (s32 fd = 0; fd < static_cast<s32>(file_descriptors.size()); ++fd) {
-        if (!file_descriptors[fd]) {
+    // first three file descriptors are reserved for:
+    // STDOUT_FILENO, STDIN_FILENO and STDERR_FILENO
+    for (s32 fd = 0; fd < s32(file_descriptors.size()); ++fd)
+        if (!file_descriptors[fd])
             return fd;
-        }
-    }
     return -1;
 }
 
 bool BSD::IsFileDescriptorValid(s32 fd) const noexcept {
-    if (fd > static_cast<s32>(MAX_FD) || fd < 0) {
-        LOG_ERROR(Service, "Invalid file descriptor handle={}", fd);
+    if (fd < 0 || fd >= s32(file_descriptors.size())) {
+        LOG_ERROR(Service, "Invalid handle={}", fd);
         return false;
     }
     if (!file_descriptors[fd]) {
-        LOG_ERROR(Service, "File descriptor handle={} is not allocated", fd);
+        LOG_ERROR(Service, "handle={} is not allocated", fd);
         return false;
     }
     return true;
 }
 
-void BSD::BuildErrnoResponse(HLERequestContext& ctx, Errno bsd_errno) const noexcept {
+void BSD::BuildErrnoResponse(HLERequestContext& ctx, Network::Errno bsd_errno) const noexcept {
     IPC::ResponseBuilder rb{ctx, 4};
 
     rb.Push(ResultSuccess);
-    rb.Push<s32>(bsd_errno == Errno::SUCCESS ? 0 : -1);
+    rb.Push<s32>(bsd_errno == Network::Errno::E_SUCCESS ? 0 : -1);
     rb.PushEnum(bsd_errno);
 }
 
 void BSD::OnProxyPacketReceived(const Network::ProxyPacket& packet) {
     for (auto& optional_descriptor : file_descriptors) {
-        if (!optional_descriptor.has_value()) {
-            continue;
+        if (optional_descriptor.has_value()) {
+            FileDescriptor& descriptor = *optional_descriptor;
+            descriptor.socket.get()->HandleProxyPacket(packet);
         }
-        FileDescriptor& descriptor = *optional_descriptor;
-        descriptor.socket.get()->HandleProxyPacket(packet);
     }
 }
 

src/core/hle/service/sockets/bsd.h

@@ -11,7 +11,7 @@
 #include <variant>
 
 #include "common/common_types.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sockets/sockets.h"
 #include "network/network.h"
@@ -35,8 +35,8 @@ public:
     // These methods are called from SSL; the first two are also called from
     // this class for the corresponding IPC methods.
     // On the real device, the SSL service makes IPC calls to this service.
-    std::variant<s32, Errno> DuplicateSocketImpl(s32 fd);
-    Errno CloseImpl(s32 fd);
+    std::variant<s32, Network::Errno> DuplicateSocketImpl(s32 fd);
+    Network::Errno CloseImpl(s32 fd);
     std::optional<std::shared_ptr<Network::SocketBase>> GetSocket(s32 fd);
 
 private:
@@ -58,7 +58,7 @@ private:
         std::span<const u8> read_buffer;
         std::vector<u8> write_buffer;
         s32 ret{};
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     struct AcceptWork {
@@ -68,7 +68,7 @@ private:
         s32 fd;
         std::vector<u8> write_buffer;
         s32 ret{};
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     struct ConnectWork {
@@ -77,7 +77,7 @@ private:
 
         s32 fd;
         std::span<const u8> addr;
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     struct RecvWork {
@@ -88,7 +88,7 @@ private:
         u32 flags;
         std::vector<u8> message;
         s32 ret{};
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     struct RecvFromWork {
@@ -100,7 +100,7 @@ private:
         std::vector<u8> message;
         std::vector<u8> addr;
         s32 ret{};
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     struct SendWork {
@@ -111,7 +111,7 @@ private:
         u32 flags;
         std::span<const u8> message;
         s32 ret{};
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     struct SendToWork {
@@ -123,7 +123,7 @@ private:
         std::span<const u8> message;
         std::span<const u8> addr;
         s32 ret{};
-        Errno bsd_errno{};
+        Network::Errno bsd_errno{};
     };
 
     void RegisterClient(HLERequestContext& ctx);
@@ -154,30 +154,30 @@ private:
     template <typename Work>
     void ExecuteWork(HLERequestContext& ctx, Work work);
 
-    std::pair<s32, Errno> SocketImpl(Domain domain, Type type, Protocol protocol);
-    std::pair<s32, Errno> PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer,
+    std::pair<s32, Network::Errno> SocketImpl(Network::Domain domain, Network::Type type, Network::Protocol protocol);
+    std::pair<s32, Network::Errno> PollImpl(std::vector<u8>& write_buffer, std::span<const u8> read_buffer,
                                    s32 nfds, s32 timeout);
-    std::pair<s32, Errno> AcceptImpl(s32 fd, std::vector<u8>& write_buffer);
-    Errno BindImpl(s32 fd, std::span<const u8> addr);
-    Errno ConnectImpl(s32 fd, std::span<const u8> addr);
-    Errno GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer);
-    Errno GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer);
-    Errno ListenImpl(s32 fd, s32 backlog);
-    std::pair<s32, Errno> FcntlImpl(s32 fd, FcntlCmd cmd, s32 arg);
-    Errno GetSockOptImpl(s32 fd, u32 level, OptName optname, std::vector<u8>& optval);
-    Errno SetSockOptImpl(s32 fd, u32 level, OptName optname, std::span<const u8> optval);
-    Errno ShutdownImpl(s32 fd, s32 how);
-    std::pair<s32, Errno> RecvImpl(s32 fd, u32 flags, std::vector<u8>& message);
-    std::pair<s32, Errno> RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message,
+    std::pair<s32, Network::Errno> AcceptImpl(s32 fd, std::vector<u8>& write_buffer);
+    Network::Errno BindImpl(s32 fd, std::span<const u8> addr);
+    Network::Errno ConnectImpl(s32 fd, std::span<const u8> addr);
+    Network::Errno GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer);
+    Network::Errno GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer);
+    Network::Errno ListenImpl(s32 fd, s32 backlog);
+    std::pair<s32, Network::Errno> FcntlImpl(s32 fd, Network::FcntlCmd cmd, s32 arg);
+    Network::Errno GetSockOptImpl(s32 fd, Network::SocketLevel level, Network::OptName optname, std::vector<u8>& optval);
+    Network::Errno SetSockOptImpl(s32 fd, Network::SocketLevel level, Network::OptName optname, std::span<const u8> optval);
+    Network::Errno ShutdownImpl(s32 fd, s32 how);
+    std::pair<s32, Network::Errno> RecvImpl(s32 fd, u32 flags, std::vector<u8>& message);
+    std::pair<s32, Network::Errno> RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message,
                                        std::vector<u8>& addr);
-    std::pair<s32, Errno> SendImpl(s32 fd, u32 flags, std::span<const u8> message);
-    std::pair<s32, Errno> SendToImpl(s32 fd, u32 flags, std::span<const u8> message,
+    std::pair<s32, Network::Errno> SendImpl(s32 fd, u32 flags, std::span<const u8> message);
+    std::pair<s32, Network::Errno> SendToImpl(s32 fd, u32 flags, std::span<const u8> message,
                                      std::span<const u8> addr);
 
     s32 FindFreeFileDescriptorHandle() noexcept;
     bool IsFileDescriptorValid(s32 fd) const noexcept;
 
-    void BuildErrnoResponse(HLERequestContext& ctx, Errno bsd_errno) const noexcept;
+    void BuildErrnoResponse(HLERequestContext& ctx, Network::Errno bsd_errno) const noexcept;
 
     static inline std::array<std::optional<FileDescriptor>, MAX_FD> file_descriptors{};
 

src/core/hle/service/sockets/sfdnsres.cpp

@@ -102,39 +102,39 @@ static bool IsBlockedHost(const std::string& host) {
         [&host](const std::string& domain) { return host.find(domain) != std::string::npos; });
 }
 
-static NetDbError GetAddrInfoErrorToNetDbError(GetAddrInfoError result) {
+static NetDbError GetAddrInfoErrorToNetDbError(Network::GetAddrInfoError result) {
     // These combinations have been verified on console (but are not
     // exhaustive).
     switch (result) {
-    case GetAddrInfoError::SUCCESS:
+    case Network::GetAddrInfoError::SUCCESS:
         return NetDbError::Success;
-    case GetAddrInfoError::AGAIN:
+    case Network::GetAddrInfoError::AGAIN:
         return NetDbError::TryAgain;
-    case GetAddrInfoError::NODATA:
+    case Network::GetAddrInfoError::NODATA:
         return NetDbError::HostNotFound;
-    case GetAddrInfoError::SERVICE:
+    case Network::GetAddrInfoError::SERVICE:
         return NetDbError::Success;
     default:
         return NetDbError::HostNotFound;
     }
 }
 
-static Errno GetAddrInfoErrorToErrno(GetAddrInfoError result) {
+static Network::Errno GetAddrInfoErrorToErrno(Network::GetAddrInfoError result) {
     // These combinations have been verified on console (but are not
     // exhaustive).
     switch (result) {
-    case GetAddrInfoError::SUCCESS:
+    case Network::GetAddrInfoError::SUCCESS:
         // Note: Sometimes a successful lookup sets errno to EADDRNOTAVAIL for
         // some reason, but that doesn't seem useful to implement.
-        return Errno::SUCCESS;
-    case GetAddrInfoError::AGAIN:
-        return Errno::SUCCESS;
-    case GetAddrInfoError::NODATA:
-        return Errno::SUCCESS;
-    case GetAddrInfoError::SERVICE:
-        return Errno::INVAL;
+        return Network::Errno::E_SUCCESS;
+    case Network::GetAddrInfoError::AGAIN:
+        return Network::Errno::E_SUCCESS;
+    case Network::GetAddrInfoError::NODATA:
+        return Network::Errno::E_SUCCESS;
+    case Network::GetAddrInfoError::SERVICE:
+        return Network::Errno::E_INVAL;
     default:
-        return Errno::SUCCESS;
+        return Network::Errno::E_SUCCESS;
     }
 }
 
@@ -155,9 +155,7 @@ static void AppendNulTerminated(std::vector<u8>& vec, std::string_view str) {
 // host's gethostbyname, because it simplifies portability: e.g., getaddrinfo
 // behaves the same on Unix and Windows, unlike gethostbyname where Windows
 // doesn't implement h_errno.
-static std::vector<u8> SerializeAddrInfoAsHostEnt(const std::vector<Network::AddrInfo>& vec,
-                                                  std::string_view host) {
-
+static std::vector<u8> SerializeAddrInfoAsHostEnt(std::span<const Network::AddrInfo> vec, std::string_view host) {
     std::vector<u8> data;
     // h_name: use the input hostname (append nul-terminated)
     AppendNulTerminated(data, host);
@@ -165,12 +163,12 @@ static std::vector<u8> SerializeAddrInfoAsHostEnt(const std::vector<Network::Add
 
     Append<u32_be>(data, 0); // count of h_aliases
     // (If the count were nonzero, the aliases would be appended as nul-terminated here.)
-    Append<u16_be>(data, static_cast<u16>(Domain::INET)); // h_addrtype
+    Append<u16_be>(data, u16(Network::Domain::INET)); // h_addrtype
     Append<u16_be>(data, sizeof(Network::IPv4Address));   // h_length
     // h_addr_list:
     size_t count = vec.size();
     ASSERT(count <= UINT32_MAX);
-    Append<u32_be>(data, static_cast<uint32_t>(count));
+    Append<u32_be>(data, u32(count));
     for (const Network::AddrInfo& addrinfo : vec) {
         // On the Switch, this is passed through htonl despite already being
         // big-endian, so it ends up as little-endian.
@@ -182,7 +180,7 @@ static std::vector<u8> SerializeAddrInfoAsHostEnt(const std::vector<Network::Add
     return data;
 }
 
-static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestContext& ctx) {
+static std::pair<u32, Network::GetAddrInfoError> GetHostByNameRequestImpl(HLERequestContext& ctx) {
     struct InputParameters {
         u8 use_nsd_resolve;
         u32 cancel_handle;
@@ -205,7 +203,7 @@ static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestConte
     // Prevent resolution of Nintendo servers
     if (IsBlockedHost(host)) {
         LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);
-        return {0, GetAddrInfoError::AGAIN};
+        return {0, Network::GetAddrInfoError::AGAIN};
     }
 
     auto res_v = Network::GetAddressInfo(host, /*service*/ std::nullopt);
@@ -213,10 +211,10 @@ static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestConte
         const std::vector<u8> data = SerializeAddrInfoAsHostEnt(*res, host);
         const u32 data_size = u32(data.size());
         ctx.WriteBuffer(data, 0);
-        return {data_size, GetAddrInfoError::SUCCESS};
+        return {data_size, Network::GetAddrInfoError::SUCCESS};
     }
     auto* err = std::get_if<Network::GetAddrInfoError>(&res_v);
-    return {0, Translate(*err)};
+    return {0, *err};
 }
 
 void SFDNSRES::GetHostByNameRequest(HLERequestContext& ctx) {
@@ -224,7 +222,7 @@ void SFDNSRES::GetHostByNameRequest(HLERequestContext& ctx) {
 
     struct OutputParameters {
         NetDbError netdb_error;
-        Errno bsd_errno;
+        Network::Errno bsd_errno;
         u32 data_size;
     };
     static_assert(sizeof(OutputParameters) == 0xc);
@@ -244,7 +242,7 @@ void SFDNSRES::GetHostByNameRequestWithOptions(HLERequestContext& ctx) {
     struct OutputParameters {
         u32 data_size;
         NetDbError netdb_error;
-        Errno bsd_errno;
+        Network::Errno bsd_errno;
     };
     static_assert(sizeof(OutputParameters) == 0xc);
 
@@ -257,24 +255,23 @@ void SFDNSRES::GetHostByNameRequestWithOptions(HLERequestContext& ctx) {
     });
 }
 
-static std::vector<u8> SerializeAddrInfo(const std::vector<Network::AddrInfo>& vec,
-                                         std::string_view host) {
+static std::vector<u8> SerializeAddrInfo(std::span<const Network::AddrInfo> vec, std::string_view host) {
     // Adapted from
     // https://github.com/switchbrew/libnx/blob/c5a9a909a91657a9818a3b7e18c9b91ff0cbb6e3/nx/source/runtime/resolver.c#L190
     std::vector<u8> data;
 
     for (const Network::AddrInfo& addrinfo : vec) {
         // serialized addrinfo:
-        Append<u32_be>(data, 0xBEEFCAFE);                                        // magic
-        Append<u32_be>(data, 0);                                                 // ai_flags
-        Append<u32_be>(data, static_cast<u32>(Translate(addrinfo.family)));      // ai_family
-        Append<u32_be>(data, static_cast<u32>(Translate(addrinfo.socket_type))); // ai_socktype
-        Append<u32_be>(data, static_cast<u32>(Translate(addrinfo.protocol)));    // ai_protocol
+        Append<u32_be>(data, 0xBEEFCAFE); // magic
+        Append<u32_be>(data, 0); // ai_flags
+        Append<u32_be>(data, u32(addrinfo.family));      // ai_family
+        Append<u32_be>(data, u32(addrinfo.socket_type)); // ai_socktype
+        Append<u32_be>(data, u32(addrinfo.protocol));    // ai_protocol
         Append<u32_be>(data, 16); // ai_addrlen
         // ^ *not* sizeof(SerializedSockAddrIn), not that it matters since they're the same size
 
         // ai_addr:
-        Append<u16_be>(data, static_cast<u16>(Translate(addrinfo.addr.family))); // sin_family
+        Append<u16_be>(data, u16(addrinfo.addr.family)); // sin_family
         // On the Switch, the following fields are passed through htonl despite
         // already being big-endian, so they end up as little-endian.
         Append<u16_le>(data, addrinfo.addr.portno);                            // sin_port
@@ -296,7 +293,7 @@ static std::vector<u8> SerializeAddrInfo(const std::vector<Network::AddrInfo>& v
     return data;
 }
 
-static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext& ctx) {
+static std::pair<u32, Network::GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext& ctx) {
     struct InputParameters {
         u8 use_nsd_resolve;
         u32 cancel_handle;
@@ -321,7 +318,7 @@ static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext
     // Prevent resolution of Nintendo servers
     if (IsBlockedHost(host)) {
         LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);
-        return {0, GetAddrInfoError::AGAIN};
+        return {0, Network::GetAddrInfoError::AGAIN};
     }
 
     std::optional<std::string> service = std::nullopt;
@@ -331,24 +328,23 @@ static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext
     }
 
     // Serialized hints are also passed in a buffer, but are ignored for now.
-
     auto res_v = Network::GetAddressInfo(host, service);
     if (auto* res = std::get_if<std::vector<Network::AddrInfo>>(&res_v)) {
         const std::vector<u8> data = SerializeAddrInfo(*res, host);
         const u32 data_size = u32(data.size());
         ctx.WriteBuffer(data, 0);
-        return {data_size, GetAddrInfoError::SUCCESS};
+        return {data_size, Network::GetAddrInfoError::SUCCESS};
     }
     auto* err = std::get_if<Network::GetAddrInfoError>(&res_v);
-    return {0, Translate(*err)};
+    return {0, *err};
 }
 
 void SFDNSRES::GetAddrInfoRequest(HLERequestContext& ctx) {
     auto [data_size, emu_gai_err] = GetAddrInfoRequestImpl(ctx);
 
     struct OutputParameters {
-        Errno bsd_errno;
-        GetAddrInfoError gai_error;
+        Network::Errno bsd_errno;
+        Network::GetAddrInfoError gai_error;
         u32 data_size;
     };
     static_assert(sizeof(OutputParameters) == 0xc);
@@ -364,7 +360,7 @@ void SFDNSRES::GetAddrInfoRequest(HLERequestContext& ctx) {
 
 void SFDNSRES::GetGaiStringErrorRequest(HLERequestContext& ctx) {
     struct InputParameters {
-        GetAddrInfoError gai_errno;
+        Network::GetAddrInfoError gai_errno;
     };
     IPC::RequestParser rp{ctx};
     auto input = rp.PopRaw<InputParameters>();
@@ -382,9 +378,9 @@ void SFDNSRES::GetAddrInfoRequestWithOptions(HLERequestContext& ctx) {
 
     struct OutputParameters {
         u32 data_size;
-        GetAddrInfoError gai_error;
+        Network::GetAddrInfoError gai_error;
         NetDbError netdb_error;
-        Errno bsd_errno;
+        Network::Errno bsd_errno;
     };
     static_assert(sizeof(OutputParameters) == 0x10);
 

src/core/hle/service/sockets/sockets.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -11,7 +14,6 @@ namespace Service::Sockets {
 
 void LoopProcess(Core::System& system) {
     auto server_manager = std::make_unique<ServerManager>(system);
-
     server_manager->RegisterNamedService("bsd:s", std::make_shared<BSD>(system, "bsd:s"));
     server_manager->RegisterNamedService("bsd:u", std::make_shared<BSD>(system, "bsd:u"));
     server_manager->RegisterNamedService("bsdcfg", std::make_shared<BSDCFG>(system));

src/core/hle/service/sockets/sockets.h

@@ -8,6 +8,7 @@
 
 #include "common/common_funcs.h"
 #include "common/common_types.h"
+#include "core/internal_network/socket_types.h"
 
 namespace Core {
 class System;
@@ -15,242 +16,6 @@ class System;
 
 namespace Service::Sockets {
 
-enum class Errno : u32 {
-    SUCCESS = 0,
-    BADF = 9,
-    AGAIN = 11,
-    INVAL = 22,
-    MFILE = 24,
-    PIPE = 32,
-    MSGSIZE = 90,
-    CONNABORTED = 103,
-    CONNRESET = 104,
-    NOTCONN = 107,
-    TIMEDOUT = 110,
-    CONNREFUSED = 111,
-    INPROGRESS = 115,
-    ISCONN = 106,
-};
-
-enum class GetAddrInfoError : s32 {
-    SUCCESS = 0,
-    ADDRFAMILY = 1,
-    AGAIN = 2,
-    BADFLAGS = 3,
-    FAIL = 4,
-    FAMILY = 5,
-    MEMORY = 6,
-    NODATA = 7,
-    NONAME = 8,
-    SERVICE = 9,
-    SOCKTYPE = 10,
-    SYSTEM = 11,
-    BADHINTS = 12,
-    PROTOCOL = 13,
-    OVERFLOW_ = 14, // avoid name collision with Windows macro
-    OTHER = 15,
-};
-
-enum class Domain : u32 {
-    Unspecified = 0,
-    INET = 2,
-};
-
-enum class Type : u32 {
-    Unspecified = 0,
-    STREAM = 1,
-    DGRAM = 2,
-    RAW = 3,
-    SEQPACKET = 5,
-};
-
-enum class Protocol : u32 {
-    IP = 0,
-    ICMP = 1,
-    TCP = 6,
-    UDP = 17,
-    //
-    IPV6 = 41,
-    RAW = 255,
-    //
-    HOPOPTS = 0,
-    IGMP = 2,
-    GGP = 3,
-    IPV4 = 4,
-    ST = 7,
-    EGP = 8,
-    PIGP = 9,
-    RCCMON = 10,
-    NVPII = 11,
-    PUP = 12,
-    ARGUS = 13,
-    EMCON = 14,
-    XNET = 15,
-    CHAOS = 16,
-    MUX = 18,
-    MEAS = 19,
-    HMP = 20,
-    PRM = 21,
-    IDP = 22,
-    TRUNK1 = 23,
-    TRUNK2 = 24,
-    LEAF1 = 25,
-    LEAF2 = 26,
-    RDP = 27,
-    IRTP = 28,
-    TP = 29,
-    BLT = 30,
-    NSP = 31,
-    INP = 32,
-    DCCP = 33,
-    //3PC = 34,
-    IDPR = 35,
-    XTP = 36,
-    DDP = 37,
-    CMTP = 38,
-    TPXX = 39,
-    IL = 40,
-    SDRP = 42,
-    ROUTING = 43,
-    FRAGMENT = 44,
-    IDRP = 45,
-    RSVP = 46,
-    GRE = 47,
-    MHRP = 48,
-    BHA = 49,
-    ESP = 50,
-    AH = 51,
-    INLSP = 52,
-    SWIPE = 53,
-    NHRP = 54,
-    MOBILE = 55,
-    TLSP = 56,
-    SKIP = 57,
-    ICMPV6 = 58,
-    NONE = 59,
-    DSTOPTS = 60,
-    AHIP = 61,
-    CFTP = 62,
-    HELLO = 63,
-    SATEXPAK = 64,
-    KRYPTOLAN = 65,
-    RVD = 66,
-    IPPC = 67,
-    ADFS = 68,
-    SATMON = 69,
-    VISA = 70,
-    IPCV = 71,
-    CPNX = 72,
-    CPHB = 73,
-    WSN = 74,
-    PVP = 75,
-    BRSATMON = 76,
-    ND = 77,
-    WBMON = 78,
-    WBEXPAK = 79,
-    EON = 80,
-    VMTP = 81,
-    SVMTP = 82,
-    VINES = 83,
-    TTP = 84,
-    IGP = 85,
-    DGP = 86,
-    TCF = 87,
-    IGRP = 88,
-    OSPFIGP = 89,
-    SRPC = 90,
-    LARP = 91,
-    MTP = 92,
-    AX25 = 93,
-    IPEIP = 94,
-    MICP = 95,
-    SCCSP = 96,
-    ETHERIP = 97,
-    ENCAP = 98,
-    APES = 99,
-    GMTP = 100,
-    IPCOMP = 108,
-    SCTP = 132,
-    MH = 135,
-    UDPLITE = 136,
-    HIP = 139,
-    SHIM6 = 140,
-    PIM = 103,
-    CARP = 112,
-    PGM = 113,
-    MPLS = 137,
-    PFSYNC = 240,
-};
-
-enum class SocketLevel : u32 {
-    IP = 0,
-    TCP = 6,
-    SOCKET = 0xffff, // i.e. SOL_SOCKET
-};
-
-enum class OptName : u32 {
-    REUSEADDR = 0x4,
-    KEEPALIVE = 0x8,
-    BROADCAST = 0x20,
-    LINGER = 0x80,
-    SNDBUF = 0x1001,
-    RCVBUF = 0x1002,
-    SNDTIMEO = 0x1005,
-    RCVTIMEO = 0x1006,
-    ERROR_ = 0x1007,   // avoid name collision with Windows macro
-    NOSIGPIPE = 0x800, // at least according to libnx
-    ACCEPTFILTER = 0x1000,
-    BINTIME = 0x2000,
-    NO_OFFLOAD = 0x4000,
-    NO_DDP = 0x8000,
-};
-
-enum class ShutdownHow : s32 {
-    RD = 0,
-    WR = 1,
-    RDWR = 2,
-};
-
-enum class FcntlCmd : s32 {
-    GETFL = 3,
-    SETFL = 4,
-};
-
-struct SockAddrIn {
-    u8 len;
-    u8 family;
-    u16 portno;
-    std::array<u8, 4> ip;
-    std::array<u8, 248> zeroes;
-};
-static_assert(sizeof(SockAddrIn) == 0x100);
-
-enum class PollEvents : u16 {
-    // Using Pascal case because IN is a macro on Windows.
-    In = 1 << 0,
-    Pri = 1 << 1,
-    Out = 1 << 2,
-    Err = 1 << 3,
-    Hup = 1 << 4,
-    Nval = 1 << 5,
-    RdNorm = 1 << 6,
-    RdBand = 1 << 7,
-    WrBand = 1 << 8,
-};
-
-DECLARE_ENUM_FLAG_OPERATORS(PollEvents);
-
-struct PollFD {
-    s32 fd;
-    PollEvents events;
-    PollEvents revents;
-};
-
-struct Linger {
-    u32 onoff;
-    u32 linger;
-};
-
 void LoopProcess(Core::System& system);
 
 } // namespace Service::Sockets

src/core/hle/service/sockets/sockets_translate.cpp

@@ -15,388 +15,42 @@
 
 namespace Service::Sockets {
 
-Errno Translate(Network::Errno value) {
-    switch (value) {
-    case Network::Errno::SUCCESS:
-        return Errno::SUCCESS;
-    case Network::Errno::BADF:
-        return Errno::BADF;
-    case Network::Errno::AGAIN:
-        return Errno::AGAIN;
-    case Network::Errno::INVAL:
-        return Errno::INVAL;
-    case Network::Errno::MFILE:
-        return Errno::MFILE;
-    case Network::Errno::PIPE:
-        return Errno::PIPE;
-    case Network::Errno::CONNREFUSED:
-        return Errno::CONNREFUSED;
-    case Network::Errno::NOTCONN:
-        return Errno::NOTCONN;
-    case Network::Errno::TIMEDOUT:
-        return Errno::TIMEDOUT;
-    case Network::Errno::CONNABORTED:
-        return Errno::CONNABORTED;
-    case Network::Errno::CONNRESET:
-        return Errno::CONNRESET;
-    case Network::Errno::INPROGRESS:
-        return Errno::INPROGRESS;
-    case Network::Errno::ISCONN:
-        return Errno::ISCONN;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented errno={}", value);
-        return Errno::SUCCESS;
-    }
-}
-
-std::pair<s32, Errno> Translate(std::pair<s32, Network::Errno> value) {
-    return {value.first, Translate(value.second)};
-}
-
-GetAddrInfoError Translate(Network::GetAddrInfoError error) {
-    switch (error) {
-    case Network::GetAddrInfoError::SUCCESS:
-        return GetAddrInfoError::SUCCESS;
-    case Network::GetAddrInfoError::ADDRFAMILY:
-        return GetAddrInfoError::ADDRFAMILY;
-    case Network::GetAddrInfoError::AGAIN:
-        return GetAddrInfoError::AGAIN;
-    case Network::GetAddrInfoError::BADFLAGS:
-        return GetAddrInfoError::BADFLAGS;
-    case Network::GetAddrInfoError::FAIL:
-        return GetAddrInfoError::FAIL;
-    case Network::GetAddrInfoError::FAMILY:
-        return GetAddrInfoError::FAMILY;
-    case Network::GetAddrInfoError::MEMORY:
-        return GetAddrInfoError::MEMORY;
-    case Network::GetAddrInfoError::NODATA:
-        return GetAddrInfoError::NODATA;
-    case Network::GetAddrInfoError::NONAME:
-        return GetAddrInfoError::NONAME;
-    case Network::GetAddrInfoError::SERVICE:
-        return GetAddrInfoError::SERVICE;
-    case Network::GetAddrInfoError::SOCKTYPE:
-        return GetAddrInfoError::SOCKTYPE;
-    case Network::GetAddrInfoError::SYSTEM:
-        return GetAddrInfoError::SYSTEM;
-    case Network::GetAddrInfoError::BADHINTS:
-        return GetAddrInfoError::BADHINTS;
-    case Network::GetAddrInfoError::PROTOCOL:
-        return GetAddrInfoError::PROTOCOL;
-    case Network::GetAddrInfoError::OVERFLOW_:
-        return GetAddrInfoError::OVERFLOW_;
-    case Network::GetAddrInfoError::OTHER:
-        return GetAddrInfoError::OTHER;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented GetAddrInfoError={}", error);
-        return GetAddrInfoError::OTHER;
-    }
-}
-
-const char* Translate(GetAddrInfoError error) {
+const char* Translate(Network::GetAddrInfoError error) {
     // https://android.googlesource.com/platform/bionic/+/085543106/libc/dns/net/getaddrinfo.c#254
     switch (error) {
-    case GetAddrInfoError::SUCCESS:
+    case Network::GetAddrInfoError::SUCCESS:
         return "Success";
-    case GetAddrInfoError::ADDRFAMILY:
+    case Network::GetAddrInfoError::ADDRFAMILY:
         return "Address family for hostname not supported";
-    case GetAddrInfoError::AGAIN:
+    case Network::GetAddrInfoError::AGAIN:
         return "Temporary failure in name resolution";
-    case GetAddrInfoError::BADFLAGS:
+    case Network::GetAddrInfoError::BADFLAGS:
         return "Invalid value for ai_flags";
-    case GetAddrInfoError::FAIL:
+    case Network::GetAddrInfoError::FAIL:
         return "Non-recoverable failure in name resolution";
-    case GetAddrInfoError::FAMILY:
+    case Network::GetAddrInfoError::FAMILY:
         return "ai_family not supported";
-    case GetAddrInfoError::MEMORY:
+    case Network::GetAddrInfoError::MEMORY:
         return "Memory allocation failure";
-    case GetAddrInfoError::NODATA:
+    case Network::GetAddrInfoError::NODATA:
         return "No address associated with hostname";
-    case GetAddrInfoError::NONAME:
+    case Network::GetAddrInfoError::NONAME:
         return "hostname nor servname provided, or not known";
-    case GetAddrInfoError::SERVICE:
+    case Network::GetAddrInfoError::SERVICE:
         return "servname not supported for ai_socktype";
-    case GetAddrInfoError::SOCKTYPE:
+    case Network::GetAddrInfoError::SOCKTYPE:
         return "ai_socktype not supported";
-    case GetAddrInfoError::SYSTEM:
+    case Network::GetAddrInfoError::SYSTEM:
         return "System error returned in errno";
-    case GetAddrInfoError::BADHINTS:
+    case Network::GetAddrInfoError::BADHINTS:
         return "Invalid value for hints";
-    case GetAddrInfoError::PROTOCOL:
+    case Network::GetAddrInfoError::PROTOCOL:
         return "Resolved protocol is unknown";
-    case GetAddrInfoError::OVERFLOW_:
+    case Network::GetAddrInfoError::OVERFLOW_:
         return "Argument buffer overflow";
     default:
         return "Unknown error";
     }
 }
 
-Network::Domain Translate(Domain domain) {
-    switch (domain) {
-    case Domain::Unspecified:
-        return Network::Domain::Unspecified;
-    case Domain::INET:
-        return Network::Domain::INET;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented domain={}", domain);
-        return {};
-    }
-}
-
-Domain Translate(Network::Domain domain) {
-    switch (domain) {
-    case Network::Domain::Unspecified:
-        return Domain::Unspecified;
-    case Network::Domain::INET:
-        return Domain::INET;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented domain={}", domain);
-        return {};
-    }
-}
-
-Network::Type Translate(Type type) {
-    switch (type) {
-    case Type::Unspecified:
-        return Network::Type::Unspecified;
-    case Type::STREAM:
-        return Network::Type::STREAM;
-    case Type::DGRAM:
-        return Network::Type::DGRAM;
-    case Type::RAW:
-        return Network::Type::RAW;
-    case Type::SEQPACKET:
-        return Network::Type::SEQPACKET;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented type={}", type);
-        return Network::Type{};
-    }
-}
-
-Type Translate(Network::Type type) {
-    switch (type) {
-    case Network::Type::Unspecified: return Type::Unspecified;
-    case Network::Type::STREAM: return Type::STREAM;
-    case Network::Type::DGRAM: return Type::DGRAM;
-    case Network::Type::RAW: return Type::RAW;
-    case Network::Type::SEQPACKET: return Type::SEQPACKET;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented type={}", type);
-        return Type{};
-    }
-}
-
-#define NETWORK_PROTOCOL_TRANSLATE_LIST \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ICMP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TCP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(UDP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IPV6) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(RAW) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IGMP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(GGP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IPV4) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ST) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(EGP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PIGP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(RCCMON) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(NVPII) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PUP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ARGUS) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(EMCON) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(XNET) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(CHAOS) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MUX) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MEAS) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(HMP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PRM) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IDP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TRUNK1) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TRUNK2) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(LEAF1) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(LEAF2) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(RDP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IRTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(BLT) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(NSP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(INP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(DCCP) \
-    /*NETWORK_PROTOCOL_TRANSLATE_ELEM(3PC)*/ \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IDPR) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(XTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(DDP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(CMTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TPXX) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IL) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SDRP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ROUTING) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(FRAGMENT) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IDRP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(RSVP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(GRE) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MHRP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(BHA) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ESP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(AH) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(INLSP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SWIPE) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(NHRP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MOBILE) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TLSP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SKIP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ICMPV6) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(NONE) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(DSTOPTS) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(AHIP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(CFTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(HELLO) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SATEXPAK) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(KRYPTOLAN) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(RVD) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IPPC) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ADFS) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SATMON) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(VISA) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IPCV) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(CPNX) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(CPHB) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(WSN) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PVP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(BRSATMON) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ND) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(WBMON) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(WBEXPAK) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(EON) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(VMTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SVMTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(VINES) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IGP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(DGP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(TCF) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IGRP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(OSPFIGP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SRPC) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(LARP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(AX25) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IPEIP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MICP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SCCSP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ETHERIP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(ENCAP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(APES) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(GMTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(IPCOMP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SCTP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MH) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(UDPLITE) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(HIP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(SHIM6) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PIM) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(CARP) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PGM) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(MPLS) \
-    NETWORK_PROTOCOL_TRANSLATE_ELEM(PFSYNC)
-[[nodiscard]] Network::Protocol Translate(Protocol protocol) {
-    switch (protocol) {
-#define NETWORK_PROTOCOL_TRANSLATE_ELEM(name) case Protocol::name: return Network::Protocol::name;
-    NETWORK_PROTOCOL_TRANSLATE_LIST
-#undef NETWORK_PROTOCOL_TRANSLATE_ELEM
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented protocol={}", protocol);
-        return {};
-    }
-}
-[[nodiscard]] Protocol Translate(Network::Protocol protocol) {
-    switch (protocol) {
-#define NETWORK_PROTOCOL_TRANSLATE_ELEM(name) case Network::Protocol::name: return Protocol::name;
-    NETWORK_PROTOCOL_TRANSLATE_LIST
-#undef NETWORK_PROTOCOL_TRANSLATE_ELEM
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented protocol={}", protocol);
-        return {};
-    }
-}
-#undef NETWORK_PROTOCOL_TRANSLATE_LIST
-
-Network::PollEvents Translate(PollEvents flags) {
-    Network::PollEvents result{};
-    const auto translate = [&result, &flags](PollEvents from, Network::PollEvents to) {
-        if (True(flags & from)) {
-            flags &= ~from;
-            result |= to;
-        }
-    };
-    translate(PollEvents::In, Network::PollEvents::In);
-    translate(PollEvents::Pri, Network::PollEvents::Pri);
-    translate(PollEvents::Out, Network::PollEvents::Out);
-    translate(PollEvents::Err, Network::PollEvents::Err);
-    translate(PollEvents::Hup, Network::PollEvents::Hup);
-    translate(PollEvents::Nval, Network::PollEvents::Nval);
-    translate(PollEvents::RdNorm, Network::PollEvents::RdNorm);
-    translate(PollEvents::RdBand, Network::PollEvents::RdBand);
-    translate(PollEvents::WrBand, Network::PollEvents::WrBand);
-
-    UNIMPLEMENTED_IF_MSG((u16)flags != 0, "Unimplemented flags={}", (u16)flags);
-    return result;
-}
-
-PollEvents Translate(Network::PollEvents flags) {
-    PollEvents result{};
-    const auto translate = [&result, &flags](Network::PollEvents from, PollEvents to) {
-        if (True(flags & from)) {
-            flags &= ~from;
-            result |= to;
-        }
-    };
-
-    translate(Network::PollEvents::In, PollEvents::In);
-    translate(Network::PollEvents::Pri, PollEvents::Pri);
-    translate(Network::PollEvents::Out, PollEvents::Out);
-    translate(Network::PollEvents::Err, PollEvents::Err);
-    translate(Network::PollEvents::Hup, PollEvents::Hup);
-    translate(Network::PollEvents::Nval, PollEvents::Nval);
-    translate(Network::PollEvents::RdNorm, PollEvents::RdNorm);
-    translate(Network::PollEvents::RdBand, PollEvents::RdBand);
-    translate(Network::PollEvents::WrBand, PollEvents::WrBand);
-
-    UNIMPLEMENTED_IF_MSG((u16)flags != 0, "Unimplemented flags={}", (u16)flags);
-    return result;
-}
-
-Network::SockAddrIn Translate(SockAddrIn value) {
-    // All lengths are valid, from [0 upto 256]
-    return {
-        .family = Translate(Domain(value.family)),
-        .ip = value.ip,
-        .portno = static_cast<u16>(value.portno >> 8 | value.portno << 8),
-    };
-}
-
-SockAddrIn Translate(Network::SockAddrIn value) {
-    return {
-        .len = 16,
-        .family = static_cast<u8>(Translate(value.family)),
-        .portno = static_cast<u16>(value.portno >> 8 | value.portno << 8),
-        .ip = value.ip,
-        .zeroes = {},
-    };
-}
-
-Network::ShutdownHow Translate(ShutdownHow how) {
-    switch (how) {
-    case ShutdownHow::RD:
-        return Network::ShutdownHow::RD;
-    case ShutdownHow::WR:
-        return Network::ShutdownHow::WR;
-    case ShutdownHow::RDWR:
-        return Network::ShutdownHow::RDWR;
-    default:
-        UNIMPLEMENTED_MSG("Unimplemented how={}", how);
-        return {};
-    }
-}
-
 } // namespace Service::Sockets

src/core/hle/service/sockets/sockets_translate.h

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -11,49 +14,7 @@
 
 namespace Service::Sockets {
 
-/// Translate abstract errno to guest errno
-Errno Translate(Network::Errno value);
-
-/// Translate abstract return value errno pair to guest return value errno pair
-std::pair<s32, Errno> Translate(std::pair<s32, Network::Errno> value);
-
-/// Translate abstract getaddrinfo error to guest getaddrinfo error
-GetAddrInfoError Translate(Network::GetAddrInfoError value);
-
 /// Translate guest error to string
-const char* Translate(GetAddrInfoError value);
-
-/// Translate guest domain to abstract domain
-Network::Domain Translate(Domain domain);
-
-/// Translate abstract domain to guest domain
-Domain Translate(Network::Domain domain);
-
-/// Translate guest type to abstract type
-Network::Type Translate(Type type);
-
-/// Translate abstract type to guest type
-Type Translate(Network::Type type);
-
-/// Translate guest protocol to abstract protocol
-Network::Protocol Translate(Protocol protocol);
-
-/// Translate abstract protocol to guest protocol
-Protocol Translate(Network::Protocol protocol);
-
-/// Translate guest poll event flags to abstract poll event flags
-Network::PollEvents Translate(PollEvents flags);
-
-/// Translate abstract poll event flags to guest poll event flags
-PollEvents Translate(Network::PollEvents flags);
-
-/// Translate guest socket address structure to abstract socket address structure
-Network::SockAddrIn Translate(SockAddrIn value);
-
-/// Translate abstract socket address structure to guest socket address structure
-SockAddrIn Translate(Network::SockAddrIn value);
-
-/// Translate guest shutdown mode to abstract shutdown mode
-Network::ShutdownHow Translate(ShutdownHow how);
+const char* Translate(Network::GetAddrInfoError value);
 
 } // namespace Service::Sockets

src/core/hle/service/ssl/ssl.cpp

@@ -132,7 +132,7 @@ public:
                 auto bsd = system.ServiceManager().GetService<Service::Sockets::BSD>("bsd:u");
                 if (bsd) {
                     auto err = bsd->CloseImpl(fd);
-                    if (err != Service::Sockets::Errno::SUCCESS) {
+                    if (err != Network::Errno::E_SUCCESS) {
                         LOG_ERROR(Service_SSL, "Failed to close duplicated socket: {}", err);
                     }
                 }
@@ -203,7 +203,7 @@ private:
 
         const bool non_block = mode == IoMode::NonBlocking;
         const Network::Errno error = socket->SetNonBlock(non_block);
-        if (error != Network::Errno::SUCCESS) {
+        if (error != Network::Errno::E_SUCCESS) {
             LOG_ERROR(Service_SSL, "Failed to set native socket non-block flag to {}", non_block);
         }
         return ResultSuccess;

src/core/hle/service/ssl/ssl_backend_openssl.cpp

@@ -290,10 +290,10 @@ public:
         BIO_clear_retry_flags(bio);
         auto [actual, err] = self->socket->Send({reinterpret_cast<const u8*>(buf), len}, 0);
         switch (err) {
-        case Network::Errno::SUCCESS:
+        case Network::Errno::E_SUCCESS:
             *actual_p = actual;
             return 1;
-        case Network::Errno::AGAIN:
+        case Network::Errno::E_AGAIN:
             BIO_set_flags(bio, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY);
             return 0;
         default:
@@ -309,13 +309,13 @@ public:
         BIO_clear_retry_flags(bio);
         auto [actual, err] = self->socket->Recv(0, {reinterpret_cast<u8*>(buf), len});
         switch (err) {
-        case Network::Errno::SUCCESS:
+        case Network::Errno::E_SUCCESS:
             *actual_p = actual;
             if (actual == 0) {
                 self->got_read_eof = true;
             }
             return actual ? 1 : 0;
-        case Network::Errno::AGAIN:
+        case Network::Errno::E_AGAIN:
             BIO_set_flags(bio, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY);
             return 0;
         default:

src/core/hle/service/ssl/ssl_backend_schannel.cpp

@@ -146,11 +146,11 @@ public:
         const auto read_span = std::span(ciphertext_read_buf).subspan(offset, fill_size);
         const auto [actual, err] = socket->Recv(0, read_span);
         switch (err) {
-        case Network::Errno::SUCCESS:
+        case Network::Errno::E_SUCCESS:
             ASSERT(static_cast<size_t>(actual) <= fill_size);
             ciphertext_read_buf.resize(offset + actual);
             return ResultSuccess;
-        case Network::Errno::AGAIN:
+        case Network::Errno::E_AGAIN:
             ciphertext_read_buf.resize(offset);
             return ResultWouldBlock;
         default:
@@ -165,12 +165,12 @@ public:
         while (!ciphertext_write_buf.empty()) {
             const auto [actual, err] = socket->Send(ciphertext_write_buf, 0);
             switch (err) {
-            case Network::Errno::SUCCESS:
+            case Network::Errno::E_SUCCESS:
                 ASSERT(static_cast<size_t>(actual) <= ciphertext_write_buf.size());
                 ciphertext_write_buf.erase(ciphertext_write_buf.begin(),
                                            ciphertext_write_buf.begin() + actual);
                 break;
-            case Network::Errno::AGAIN:
+            case Network::Errno::E_AGAIN:
                 return ResultWouldBlock;
             default:
                 LOG_ERROR(Service_SSL, "Socket send returned Network::Errno {}", err);

src/core/hle/service/ssl/ssl_backend_securetransport.cpp

@@ -195,7 +195,7 @@ public:
             LOG_CRITICAL(Service_SSL, "op={}, offset={} actual={}/{} err={}", is_read, offset,
                          actual, cur.size(), static_cast<s32>(err));
             switch (err) {
-            case Network::Errno::SUCCESS:
+            case Network::Errno::E_SUCCESS:
                 offset += actual;
                 if (actual == 0) {
                     ASSERT(is_read);
@@ -203,7 +203,7 @@ public:
                     return errSecEndOfData;
                 }
                 break;
-            case Network::Errno::AGAIN:
+            case Network::Errno::E_AGAIN:
                 *dataLength = offset;
                 return errSSLWouldBlock;
             default:

src/core/internal_network/emu_net_state.h

@@ -1,10 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
+
 #include <atomic>
-#include <common/socket_types.h>
 #include <mutex>
+#include "core/internal_network/socket_types.h"
 
 namespace Network {
 

src/core/internal_network/network.h

@@ -13,7 +13,7 @@
 
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
@@ -31,68 +31,10 @@ namespace Network {
 class SocketBase;
 class Socket;
 
-/// Error code for network functions
-enum class Errno {
-    SUCCESS,
-    BADF,
-    INVAL,
-    MFILE,
-    PIPE,
-    NOTCONN,
-    AGAIN,
-    CONNREFUSED,
-    CONNRESET,
-    CONNABORTED,
-    HOSTUNREACH,
-    NETDOWN,
-    NETUNREACH,
-    TIMEDOUT,
-    MSGSIZE,
-    INPROGRESS,
-    ISCONN,
-    OTHER,
-};
-
-enum class GetAddrInfoError {
-    SUCCESS,
-    ADDRFAMILY,
-    AGAIN,
-    BADFLAGS,
-    FAIL,
-    FAMILY,
-    MEMORY,
-    NODATA,
-    NONAME,
-    SERVICE,
-    SOCKTYPE,
-    SYSTEM,
-    BADHINTS,
-    PROTOCOL,
-    OVERFLOW_,
-    OTHER,
-};
-
-/// Cross-platform poll fd structure
-
-enum class PollEvents : u16 {
-    // Using Pascal case because IN is a macro on Windows.
-    In = 1 << 0,
-    Pri = 1 << 1,
-    Out = 1 << 2,
-    Err = 1 << 3,
-    Hup = 1 << 4,
-    Nval = 1 << 5,
-    RdNorm = 1 << 6,
-    RdBand = 1 << 7,
-    WrBand = 1 << 8,
-};
-
-DECLARE_ENUM_FLAG_OPERATORS(PollEvents);
-
-struct PollFD {
-    SocketBase* socket;
-    PollEvents events;
-    PollEvents revents;
+struct HostPollFD {
+    SocketBase* socket = nullptr;
+    Network::PollEvents events = {};
+    Network::PollEvents revents = {};
 };
 
 class NetworkInstance {
@@ -101,6 +43,10 @@ public:
     ~NetworkInstance();
 };
 
+sockaddr_in TranslateFromSockAddrIn(Network::SockAddrIn input);
+Network::SockAddrIn TranslateToSockAddrIn(sockaddr_in input);
+s32 TranslateMsgOptToNative(s32 flags);
+
 void CancelPendingSocketOperations();
 void RestartSocketOperations();
 

src/core/internal_network/network_interface.cpp

@@ -46,7 +46,7 @@ namespace Network {
 
 #ifdef _WIN32
 
-std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
+std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
 
     ULONG buf_size = 0;
     if (GetAdaptersAddresses(
@@ -66,7 +66,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
         return {};
     }
 
-    std::vector<Network::NetworkInterface> result;
+    std::vector<NetworkInterface> result;
 
     for (auto* a = addrs; a; a = a->Next) {
 
@@ -89,7 +89,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
             gw = reinterpret_cast<sockaddr_in*>(a->FirstGatewayAddress->Address.lpSockaddr)
                      ->sin_addr;
 
-        result.emplace_back(Network::NetworkInterface{
+        result.emplace_back(NetworkInterface{
             .name = Common::UTF16ToUTF8(std::wstring{a->FriendlyName}),
             .ip_address = ip,
             .subnet_mask = mask,
@@ -103,7 +103,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
 
 #else
 
-std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
+std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
 #if defined(__ANDROID__) || defined(__linux__)
     struct ifaddrs* ifaddr = nullptr;
     if (getifaddrs(&ifaddr) != 0) {
@@ -135,7 +135,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
         LOG_WARNING(Network, "\"/proc/net/route\" not found - using gateway 0");
     }
 #endif
-    std::vector<Network::NetworkInterface> ifaces;
+    std::vector<NetworkInterface> ifaces;
     for (auto ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next) {
         if (ifa->ifa_addr == nullptr || ifa->ifa_netmask == nullptr /* Have a netmask and address */
         || ifa->ifa_addr->sa_family != AF_INET /* Must be of kind AF_INET */
@@ -149,7 +149,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
         });
         in_addr gw; // Solaris defines s_addr as a macro, can't use special C++ shenanigans here
         gw.s_addr = it != routes.end() ? it->gateway : 0;
-        ifaces.emplace_back(Network::NetworkInterface{
+        ifaces.emplace_back(NetworkInterface{
             .name = ifa->ifa_name,
             .ip_address = std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr,
             .subnet_mask = std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr,
@@ -159,7 +159,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
     freeifaddrs(ifaddr);
     return ifaces;
 #elif defined(__FreeBSD__)
-    std::vector<Network::NetworkInterface> ifaces;
+    std::vector<NetworkInterface> ifaces;
     int fd = ::socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC);
     if (fd < 0) {
         LOG_ERROR(Network, "socket: {}", std::strerror(errno));
@@ -191,7 +191,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
             size_t msglen = rtm->rtm_msglen - sizeof(*ifm);
             char const* p = (char const*)(ifm + 1);
 
-            Network::NetworkInterface iface{};
+            NetworkInterface iface{};
             for (size_t i = 0; i < RTAX_MAX; i++)
                 if ((ifm->ifm_addrs & (1 << i)) != 0) {
                     struct sockaddr const* sa = reinterpret_cast<struct sockaddr const*>(p);
@@ -220,7 +220,7 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() {
 
 #endif // _WIN32
 
-std::optional<Network::NetworkInterface> GetSelectedNetworkInterface() {
+std::optional<NetworkInterface> GetSelectedNetworkInterface() {
     auto const& sel_if = Settings::values.network_interface.GetValue();
     if (auto const ifaces = Network::GetAvailableNetworkInterfaces(); ifaces.size() > 0) {
         if (sel_if.empty())

src/core/internal_network/socket_icmp.cpp

@@ -0,0 +1,184 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <cstdio>
+#include "common/assert.h"
+#include "common/logging.h"
+#include "core/internal_network/socket_icmp.h"
+
+#ifdef __unix__
+#include <unistd.h>
+#include <sys/socket.h>
+#endif
+
+namespace Network {
+
+namespace {
+
+u16 ComputeChecksum(std::span<const u8> data) {
+    u32 sum = 0;
+    for (size_t i = 0; i < data.size(); i += 2) {
+        u32 value = (u32(data[i + 0]) << 8ull) | u32(data[i + 1]); //big endian
+        sum += value;
+    }
+    if (data.size() % 2 != 0){
+        sum += u16(data[data.size() - 1]) << 8;
+    }
+    while ((sum >> 16) != 0)
+        sum = (sum & 0xffff) + (sum >> 16);
+    return (~sum) & 0xffff;
+}
+
+}
+
+IcmpSocket::IcmpSocket() noexcept {}
+
+IcmpSocket::~IcmpSocket() {
+    if (fd == INVALID_SOCKET) {
+        return;
+    }
+    fd = INVALID_SOCKET;
+}
+
+Errno IcmpSocket::SetSockOpt(Network::SocketLevel level, Network::OptName optname, std::span<const u8> optval) {
+    LOG_WARNING(Network, "(stubbed) level={},optname={},optval={}", level, optname, optval.size());
+    if (optname == Network::OptName::RCVTIMEO) {
+        if (optval.size() < sizeof(Network::Timeval))
+            return Errno::E_INVAL;
+        std::memcpy(&rcv_timeo, optval.data(), sizeof(rcv_timeo));
+    }
+    return Errno::E_SUCCESS;
+}
+
+Errno IcmpSocket::Initialize(Domain domain, Type type, Protocol socket_protocol) {
+    return Errno::E_SUCCESS;
+}
+
+std::pair<IcmpSocket::AcceptResult, Errno> IcmpSocket::Accept() {
+    LOG_WARNING(Network, "(stubbed) called");
+    return {AcceptResult{}, Errno::E_SUCCESS};
+}
+
+Errno IcmpSocket::Connect(Network::SockAddrIn addr_in) {
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
+}
+
+std::pair<Network::SockAddrIn, Errno> IcmpSocket::GetPeerName() {
+    LOG_WARNING(Network, "(stubbed) called");
+    return {Network::SockAddrIn{}, Errno::E_SUCCESS};
+}
+
+std::pair<Network::SockAddrIn, Errno> IcmpSocket::GetSockName() {
+    LOG_WARNING(Network, "(stubbed) called");
+    return {Network::SockAddrIn{}, Errno::E_SUCCESS};
+}
+
+Errno IcmpSocket::Bind(Network::SockAddrIn addr) {
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
+}
+
+Errno IcmpSocket::Listen(s32 backlog) {
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
+}
+
+Errno IcmpSocket::Shutdown(ShutdownHow how) {
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
+}
+
+std::pair<s32, Errno> IcmpSocket::Recv(int flags, std::span<u8> message) {
+    LOG_DEBUG(Network, "(stubbed) called");
+    return {s32(0), Errno::E_NOTCONN};
+}
+
+std::pair<s32, Errno> IcmpSocket::RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) {
+    LOG_DEBUG(Network, "(stubbed) called");
+    ASSERT(flags == 0);
+    ASSERT(message.size() < std::size_t((std::numeric_limits<int>::max)()));
+#if !defined(__OPENORBIS__) && (defined(__FreeBSD__) || defined(__linux__))
+    if (addr) {
+        if (seq_ident.empty())
+            return {0, Errno::E_SUCCESS};
+        // PLEASE DON'T KILL ME, I SWEAR THIS IS LEGITIMATELY THE BEST WAY TO DO IT
+        // IF YOU OPEN socket() GOOGLE WILL STRAIGHT UP IP BAN YOU AFTER 2 HOURS
+        auto const rcv_timeout = std::max<u64>(rcv_timeo.tv_sec, 1);
+#ifdef __FreeBSD__
+        auto const cmd = fmt::format("ping -t {} -o {}.{}.{}.{}", rcv_timeout, addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]);
+#elif defined(__linux__)
+        auto const cmd = fmt::format("ping -c 1 -W {} {}.{}.{}.{}", rcv_timeout, addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]);
+#endif
+        if (::system(cmd.c_str()) == 0) {
+            std::vector<u8> data{
+                8,
+                0,
+                0, //checksum
+                0,
+                u8(seq_ident.front() >> 24), //ident
+                u8(seq_ident.front() >> 16),
+                u8(seq_ident.front() >> 8), // seq
+                u8(seq_ident.front() >> 0),
+            };
+            seq_ident.pop_back();
+            auto const csum = ComputeChecksum(std::span<const u8>{data.begin(), data.end()});
+            data[2] = u8(csum >> 8); //hi
+            data[3] = u8(csum); //lo
+            auto const n = (std::max)(data.size(), message.size());
+            std::copy(data.begin(), data.begin() + n, message.begin());
+            return {n, Errno::E_SUCCESS};
+        }
+        return {-1, Errno::E_TIMEDOUT};
+    }
+#endif
+    return {-1, Errno::E_INVAL};
+}
+
+std::pair<s32, Errno> IcmpSocket::Send(std::span<const u8> message, int flags) {
+    LOG_DEBUG(Network, "(stubbed) called");
+    seq_ident.push_back(
+        (u32(message[4]) << 24)
+        | (u32(message[5]) << 16)
+        | (u32(message[6]) << 8)
+        | (u32(message[7]) << 0)
+    );
+    return {s32(0), Errno::E_NOTCONN};
+}
+
+std::pair<s32, Errno> IcmpSocket::SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) {
+    LOG_DEBUG(Network, "(stubbed) called");
+    ASSERT(message.size() < size_t((std::numeric_limits<int>::max)()));
+    // 0 -> 8 (IPv4), 128 (IPv6)
+    // 1 -> 0
+    // 2..4 -> checksum
+    // 4..6 -> ident
+    // 6..8 -> seq
+    if (!message.empty())
+        return {s32(message.size()), Errno::E_SUCCESS};
+    return {-1, Errno::E_INVAL};
+}
+
+Errno IcmpSocket::Close() {
+    LOG_DEBUG(Network, "called");
+    fd = INVALID_SOCKET;
+    return Errno::E_SUCCESS;
+}
+
+std::pair<Errno, Errno> IcmpSocket::GetPendingError() {
+    LOG_DEBUG(Network, "called");
+    return {Errno::E_SUCCESS, Errno::E_SUCCESS};
+}
+
+bool IcmpSocket::IsOpened() const {
+    return fd != INVALID_SOCKET;
+}
+
+void IcmpSocket::HandleProxyPacket(const ProxyPacket& packet) {
+    LOG_WARNING(Network, "(stubbed) called");
+}
+Errno IcmpSocket::SetNonBlock(bool enable) {
+    return Errno::E_SUCCESS;
+}
+
+} // namespace Network

src/core/internal_network/socket_icmp.h

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <span>
+#include "core/internal_network/socket_types.h"
+#include "core/internal_network/sockets.h"
+
+namespace Network {
+
+class IcmpSocket : public Network::SocketBase {
+public:
+    explicit IcmpSocket() noexcept;
+    ~IcmpSocket() override;
+    Errno Initialize(Domain domain, Type type, Protocol socket_protocol) override;
+    Errno Close() override;
+    std::pair<AcceptResult, Errno> Accept() override;
+    Errno Connect(Network::SockAddrIn addr_in) override;
+    std::pair<Network::SockAddrIn, Errno> GetPeerName() override;
+    std::pair<Network::SockAddrIn, Errno> GetSockName() override;
+    Errno Bind(Network::SockAddrIn addr) override;
+    Errno Listen(s32 backlog) override;
+    Errno Shutdown(ShutdownHow how) override;
+    std::pair<s32, Errno> Recv(int flags, std::span<u8> message) override;
+    std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) override;
+    std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override;
+    std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) override;
+    Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span<const u8> value) override;
+    std::pair<Errno, Errno> GetPendingError() override;
+    bool IsOpened() const override;
+    void HandleProxyPacket(const ProxyPacket& packet) override;
+    Errno SetNonBlock(bool enable) override;
+
+    std::vector<u32> seq_ident;
+    Network::Timeval rcv_timeo;
+};
+
+} // namespace Network

src/core/internal_network/socket_proxy.cpp

@@ -47,71 +47,82 @@ void ProxySocket::HandleProxyPacket(const ProxyPacket& packet) {
     received_packets.push(decompressed);
 }
 
-template <typename T>
-Errno ProxySocket::SetSockOpt(SOCKET fd_, int option, T value) {
-    LOG_DEBUG(Network, "(STUBBED) called");
-    return Errno::SUCCESS;
+Errno ProxySocket::SetNonBlock(bool enable) {
+    blocking = !enable;
+    return Errno::E_SUCCESS;
+}
+
+Errno ProxySocket::SetSockOpt(Network::SocketLevel level, Network::OptName optname, std::span<const u8> optval) {
+    LOG_DEBUG(Network, "level={},optname={},optval={}", level, optname, optval.size());
+    // numeric values?
+    if (optval.size() >= sizeof(u32)) {
+        u32 value;
+        std::memcpy(&value, optval.data(), sizeof(value));
+        if (optname == Network::OptName::BROADCAST)
+            broadcast = bool(value);
+        if (optname == Network::OptName::SNDTIMEO)
+            send_timeout = value;
+        if (optname == Network::OptName::RCVTIMEO)
+            receive_timeout = value;
+    }
+    return Errno::E_SUCCESS;
 }
 
 Errno ProxySocket::Initialize(Domain domain, Type type, Protocol socket_protocol) {
     protocol = socket_protocol;
-    SetSockOpt(fd, SO_TYPE, type);
-
-    return Errno::SUCCESS;
+    return Errno::E_SUCCESS;
 }
 
 std::pair<ProxySocket::AcceptResult, Errno> ProxySocket::Accept() {
-    LOG_WARNING(Network, "(STUBBED) called");
-    return {AcceptResult{}, Errno::SUCCESS};
+    LOG_WARNING(Network, "(stubbed) called");
+    return {AcceptResult{}, Errno::E_SUCCESS};
 }
 
-Errno ProxySocket::Connect(SockAddrIn addr_in) {
-    LOG_WARNING(Network, "(STUBBED) called");
-    return Errno::SUCCESS;
+Errno ProxySocket::Connect(Network::SockAddrIn addr_in) {
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
 }
 
-std::pair<SockAddrIn, Errno> ProxySocket::GetPeerName() {
-    LOG_WARNING(Network, "(STUBBED) called");
-    return {SockAddrIn{}, Errno::SUCCESS};
+std::pair<Network::SockAddrIn, Errno> ProxySocket::GetPeerName() {
+    LOG_WARNING(Network, "(stubbed) called");
+    return {Network::SockAddrIn{}, Errno::E_SUCCESS};
 }
 
-std::pair<SockAddrIn, Errno> ProxySocket::GetSockName() {
-    LOG_WARNING(Network, "(STUBBED) called");
-    return {SockAddrIn{}, Errno::SUCCESS};
+std::pair<Network::SockAddrIn, Errno> ProxySocket::GetSockName() {
+    LOG_WARNING(Network, "(stubbed) called");
+    return {Network::SockAddrIn{}, Errno::E_SUCCESS};
 }
 
-Errno ProxySocket::Bind(SockAddrIn addr) {
+Errno ProxySocket::Bind(Network::SockAddrIn addr) {
     if (is_bound) {
         LOG_WARNING(Network, "Rebinding Socket is unimplemented!");
-        return Errno::SUCCESS;
+        return Errno::E_SUCCESS;
     }
     local_endpoint = addr;
     is_bound = true;
-
-    return Errno::SUCCESS;
+    return Errno::E_SUCCESS;
 }
 
 Errno ProxySocket::Listen(s32 backlog) {
-    LOG_WARNING(Network, "(STUBBED) called");
-    return Errno::SUCCESS;
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
 }
 
 Errno ProxySocket::Shutdown(ShutdownHow how) {
-    LOG_WARNING(Network, "(STUBBED) called");
-    return Errno::SUCCESS;
+    LOG_WARNING(Network, "(stubbed) called");
+    return Errno::E_SUCCESS;
 }
 
 std::pair<s32, Errno> ProxySocket::Recv(int flags, std::span<u8> message) {
-    LOG_WARNING(Network, "(STUBBED) called");
+    LOG_WARNING(Network, "(stubbed) called");
     ASSERT(flags == 0);
-    ASSERT(message.size() < static_cast<size_t>((std::numeric_limits<int>::max)()));
-
-    return {static_cast<s32>(0), Errno::SUCCESS};
+    ASSERT(message.size() < std::size_t((std::numeric_limits<int>::max)()));
+    return {s32(0), Errno::E_SUCCESS};
 }
 
-std::pair<s32, Errno> ProxySocket::RecvFrom(int flags, std::span<u8> message, SockAddrIn* addr) {
+std::pair<s32, Errno> ProxySocket::RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) {
     ASSERT(flags == 0);
-    ASSERT(message.size() < static_cast<size_t>((std::numeric_limits<int>::max)()));
+    ASSERT(message.size() < std::size_t((std::numeric_limits<int>::max)()));
 
     // TODO (flTobi): Verify the timeout behavior and break when connection is lost
     const auto timestamp = std::chrono::steady_clock::now();
@@ -128,88 +139,85 @@ std::pair<s32, Errno> ProxySocket::RecvFrom(int flags, std::span<u8> message, So
         }
 
         if (!blocking) {
-            return {-1, Errno::AGAIN};
+            return {-1, Errno::E_AGAIN};
         }
 
         std::this_thread::yield();
 
         const auto time_diff = std::chrono::steady_clock::now() - timestamp;
-        const auto time_diff_ms =
-            std::chrono::duration_cast<std::chrono::milliseconds>(time_diff).count();
-
+        const auto time_diff_ms = std::chrono::duration_cast<std::chrono::milliseconds>(time_diff).count();
         if (time_diff_ms > timeout) {
-            return {-1, Errno::TIMEDOUT};
+            return {-1, Errno::E_TIMEDOUT};
         }
     }
 }
 
-std::pair<s32, Errno> ProxySocket::ReceivePacket(int flags, std::span<u8> message, SockAddrIn* addr,
-                                                 std::size_t max_length) {
+std::pair<s32, Errno> ProxySocket::ReceivePacket(int flags, std::span<u8> message, Network::SockAddrIn* addr, std::size_t max_length) {
+    LOG_DEBUG(Network, "called");
     ProxyPacket& packet = received_packets.front();
     if (addr) {
-        addr->family = Domain::INET;
+        addr->len = 16;
+        addr->family = u8(Network::Domain::INET);
         addr->ip = packet.local_endpoint.ip;         // The senders ip address
         addr->portno = packet.local_endpoint.portno; // The senders port number
+        addr->zeroes = {};
     }
 
-    bool peek = (flags & FLAG_MSG_PEEK) != 0;
+    bool peek = (flags & u32(Network::MsgOpt::PEEK)) != 0;
     std::size_t read_bytes;
     if (packet.data.size() > max_length) {
         read_bytes = max_length;
-        memcpy(message.data(), packet.data.data(), max_length);
+        std::memcpy(message.data(), packet.data.data(), max_length);
 
         if (protocol == Protocol::UDP) {
             if (!peek) {
                 received_packets.pop();
             }
-            return {-1, Errno::MSGSIZE};
+            return {-1, Errno::E_MSGSIZE};
         } else if (protocol == Protocol::TCP) {
             std::vector<u8> numArray(packet.data.size() - max_length);
-            std::copy(packet.data.begin() + max_length, packet.data.end(),
-                      std::back_inserter(numArray));
+            std::copy(packet.data.begin() + max_length, packet.data.end(), std::back_inserter(numArray));
             packet.data = numArray;
         }
     } else {
         read_bytes = packet.data.size();
-        memcpy(message.data(), packet.data.data(), read_bytes);
+        std::memcpy(message.data(), packet.data.data(), read_bytes);
         if (!peek) {
             received_packets.pop();
         }
     }
 
-    return {static_cast<u32>(read_bytes), Errno::SUCCESS};
+    return {u32(read_bytes), Errno::E_SUCCESS};
 }
 
 std::pair<s32, Errno> ProxySocket::Send(std::span<const u8> message, int flags) {
-    LOG_WARNING(Network, "(STUBBED) called");
-    ASSERT(message.size() < static_cast<size_t>((std::numeric_limits<int>::max)()));
+    LOG_WARNING(Network, "(stubbed) called");
+    ASSERT(message.size() < size_t((std::numeric_limits<int>::max)()));
     ASSERT(flags == 0);
-
-    return {static_cast<s32>(0), Errno::SUCCESS};
+    return {s32(0), Errno::E_SUCCESS};
 }
 
 void ProxySocket::SendPacket(ProxyPacket& packet) {
     if (auto room_member = Network::GetRoomMember().lock()) {
         if (room_member->IsConnected()) {
-            packet.data = Common::Compression::CompressDataZSTDDefault(packet.data.data(),
-                                                                       packet.data.size());
+            packet.data = Common::Compression::CompressDataZSTDDefault(packet.data.data(), packet.data.size());
             room_member->SendProxyPacket(packet);
         }
     }
 }
 
-std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, std::span<const u8> message,
-                                          const SockAddrIn* addr) {
+std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) {
+    LOG_DEBUG(Network, "called");
     ASSERT(flags == 0);
 
     if (!is_bound) {
         LOG_ERROR(Network, "ProxySocket is not bound!");
-        return {static_cast<s32>(message.size()), Errno::SUCCESS};
+        return {s32(message.size()), Errno::E_SUCCESS};
     }
 
     if (auto room_member = Network::GetRoomMember().lock()) {
         if (!room_member->IsConnected()) {
-            return {static_cast<s32>(message.size()), Errno::SUCCESS};
+            return {s32(message.size()), Errno::E_SUCCESS};
         }
     }
 
@@ -234,66 +242,20 @@ std::pair<s32, Errno> ProxySocket::SendTo(u32 flags, std::span<const u8> message
 
     SendPacket(packet);
 
-    return {static_cast<s32>(message.size()), Errno::SUCCESS};
+    return {s32(message.size()), Errno::E_SUCCESS};
 }
 
 Errno ProxySocket::Close() {
+    LOG_DEBUG(Network, "called");
     fd = INVALID_SOCKET;
     closed = true;
 
-    return Errno::SUCCESS;
-}
-
-Errno ProxySocket::SetLinger(bool enable, u32 linger) {
-    struct Linger {
-        u16 linger_enable;
-        u16 linger_time;
-    } values;
-    values.linger_enable = enable ? 1 : 0;
-    values.linger_time = static_cast<u16>(linger);
-
-    return SetSockOpt(fd, SO_LINGER, values);
-}
-
-Errno ProxySocket::SetReuseAddr(bool enable) {
-    return SetSockOpt<u32>(fd, SO_REUSEADDR, enable ? 1 : 0);
-}
-
-Errno ProxySocket::SetBroadcast(bool enable) {
-    broadcast = enable;
-    return SetSockOpt<u32>(fd, SO_BROADCAST, enable ? 1 : 0);
-}
-
-Errno ProxySocket::SetSndBuf(u32 value) {
-    return SetSockOpt(fd, SO_SNDBUF, value);
-}
-
-Errno ProxySocket::SetKeepAlive(bool enable) {
-    return Errno::SUCCESS;
-}
-
-Errno ProxySocket::SetRcvBuf(u32 value) {
-    return SetSockOpt(fd, SO_RCVBUF, value);
-}
-
-Errno ProxySocket::SetSndTimeo(u32 value) {
-    send_timeout = value;
-    return SetSockOpt(fd, SO_SNDTIMEO, static_cast<int>(value));
-}
-
-Errno ProxySocket::SetRcvTimeo(u32 value) {
-    receive_timeout = value;
-    return SetSockOpt(fd, SO_RCVTIMEO, static_cast<int>(value));
-}
-
-Errno ProxySocket::SetNonBlock(bool enable) {
-    blocking = !enable;
-    return Errno::SUCCESS;
+    return Errno::E_SUCCESS;
 }
 
 std::pair<Errno, Errno> ProxySocket::GetPendingError() {
-    LOG_DEBUG(Network, "(STUBBED) called");
-    return {Errno::SUCCESS, Errno::SUCCESS};
+    LOG_DEBUG(Network, "called");
+    return {Errno::E_SUCCESS, Errno::E_SUCCESS};
 }
 
 bool ProxySocket::IsOpened() const {

src/core/internal_network/socket_proxy.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -29,13 +29,13 @@ public:
 
     std::pair<AcceptResult, Errno> Accept() override;
 
-    Errno Connect(SockAddrIn addr_in) override;
+    Errno Connect(Network::SockAddrIn addr_in) override;
 
-    std::pair<SockAddrIn, Errno> GetPeerName() override;
+    std::pair<Network::SockAddrIn, Errno> GetPeerName() override;
 
-    std::pair<SockAddrIn, Errno> GetSockName() override;
+    std::pair<Network::SockAddrIn, Errno> GetSockName() override;
 
-    Errno Bind(SockAddrIn addr) override;
+    Errno Bind(Network::SockAddrIn addr) override;
 
     Errno Listen(s32 backlog) override;
 
@@ -43,9 +43,9 @@ public:
 
     std::pair<s32, Errno> Recv(int flags, std::span<u8> message) override;
 
-    std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, SockAddrIn* addr) override;
+    std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) override;
 
-    std::pair<s32, Errno> ReceivePacket(int flags, std::span<u8> message, SockAddrIn* addr,
+    std::pair<s32, Errno> ReceivePacket(int flags, std::span<u8> message, Network::SockAddrIn* addr,
                                         std::size_t max_length);
 
     std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override;
@@ -53,28 +53,11 @@ public:
     void SendPacket(ProxyPacket& packet);
 
     std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message,
-                                 const SockAddrIn* addr) override;
-
-    Errno SetLinger(bool enable, u32 linger) override;
-
-    Errno SetReuseAddr(bool enable) override;
-
-    Errno SetBroadcast(bool enable) override;
-
-    Errno SetKeepAlive(bool enable) override;
-
-    Errno SetSndBuf(u32 value) override;
-
-    Errno SetRcvBuf(u32 value) override;
-
-    Errno SetSndTimeo(u32 value) override;
-
-    Errno SetRcvTimeo(u32 value) override;
+                                 const Network::SockAddrIn* addr) override;
 
     Errno SetNonBlock(bool enable) override;
 
-    template <typename T>
-    Errno SetSockOpt(SOCKET fd, int option, T value);
+    Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span<const u8> value) override;
 
     std::pair<Errno, Errno> GetPendingError() override;
 
@@ -86,7 +69,7 @@ private:
     u32 send_timeout = 0;
     u32 receive_timeout = 0;
     bool is_bound = false;
-    SockAddrIn local_endpoint{};
+    Network::SockAddrIn local_endpoint{};
     bool blocking = true;
     std::queue<ProxyPacket> received_packets;
     Protocol protocol;

src/core/internal_network/socket_types.h

@@ -0,0 +1,470 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <optional>
+#include <string>
+
+#include "common/common_types.h"
+#include "common/common_funcs.h"
+
+// Most of these structures are direct mappings of guest's
+// expectations for these values, in other words, they're the
+// values that HOS is expected to use AND handle.
+
+namespace Network {
+
+enum class Errno : u32 {
+    E_SUCCESS = 0,
+    E_PERM = 1,
+    E_NOENT = 2,
+    E_SRCH = 3,
+    E_INTR = 4,
+    E_IO = 5,
+    E_NXIO = 6,
+    E_2BIG = 7,
+    E_NOEXEC = 8,
+    E_BADF = 9,
+    E_CHILD = 10,
+    E_AGAIN = 11,
+    E_NOMEM = 12,
+    E_ACCES = 13,
+    E_FAULT = 14,
+    E_NOTBLK = 15,
+    E_BUSY = 16,
+    E_EXIST = 17,
+    E_XDEV = 18,
+    E_NODEV = 19,
+    E_NOTDIR = 20,
+    E_ISDIR = 21,
+    E_INVAL = 22,
+    E_NFILE = 23,
+    E_MFILE = 24,
+    E_NOTTY = 25,
+    E_TXTBSY = 26,
+    E_FBIG = 27,
+    E_NOSPC = 28,
+    E_SPIPE = 29,
+    E_ROFS = 30,
+    E_MLINK = 31,
+    E_PIPE = 32,
+    E_DOM = 33,
+    E_RANGE = 34,
+    E_DEADLK = 35,
+    E_NAMETOOLONG = 36,
+    E_NOLCK = 37,
+    E_NOSYS = 38,
+    E_NOTEMPTY = 39,
+    E_LOOP = 40,
+    E_NOMSG = 42,
+    E_IDRM = 43,
+    E_CHRNG = 44,
+    E_L2NSYNC = 45,
+    E_L3HLT = 46,
+    E_L3RST = 47,
+    E_LNRNG = 48,
+    E_UNATCH = 49,
+    E_NOCSI = 50,
+    E_L2HLT = 51,
+    E_BADE = 52,
+    E_BADR = 53,
+    E_XFULL = 54,
+    E_NOANO = 55,
+    E_BADRQC = 56,
+    E_BADSSL = 57,
+    E_BFONT = 59,
+    E_NOSTR = 60,
+    E_NODATA = 61,
+    E_TIME = 62,
+    E_NOSR = 63,
+    E_NONET = 64,
+    E_NOPKG = 65,
+    E_REMOTE = 66,
+    E_NOLINK = 67,
+    E_ADV = 68,
+    E_SRMNT = 69,
+    E_COMM = 70,
+    E_PROTO = 71,
+    E_MULTIHOP = 72,
+    E_DOTDOT = 73,
+    E_BADMSG = 74,
+    E_OVERFLOW = 75,
+    E_NOTUNUQ = 76,
+    E_BADFD = 77,
+    E_REMCHG = 78,
+    E_LIBACC = 79,
+    E_LIBBAD = 80,
+    E_LIBSCN = 81,
+    E_LIBMAX = 82,
+    E_LIBEXEC = 83,
+    E_ILSEQ = 84,
+    E_RESTART = 85,
+    E_STRPIPE = 86,
+    E_USERS = 87,
+    E_NOTSOCK = 88,
+    E_DESTADDRREQ = 89,
+    E_MSGSIZE = 90,
+    E_PROTOTYPE = 91,
+    E_NOPROTOOPT = 92,
+    E_PROTONOSUPPORT = 93,
+    E_SOCKTNOSUPPORT = 94,
+    E_OPNOTSUPP = 95,
+    E_PFNOSUPPORT = 96,
+    E_AFNOSUPPORT = 97,
+    E_ADDRINUSE = 98,
+    E_ADDRNOTAVAIL = 99,
+    E_NETDOWN = 100,
+    E_NETUNREACH = 101,
+    E_NETRESET = 102,
+    E_CONNABORTED = 103,
+    E_CONNRESET = 104,
+    E_NOBUFS = 105,
+    E_ISCONN = 106,
+    E_NOTCONN = 107,
+    E_SHUTDOWN = 108,
+    E_TOOMANYREFS = 109,
+    E_TIMEDOUT = 110,
+    E_CONNREFUSED = 111,
+    E_HOSTDOWN = 112,
+    E_HOSTUNREACH = 113,
+    E_ALREADY = 114,
+    E_INPROGRESS = 115,
+    E_STALE = 116,
+    E_UCLEAN = 117,
+    E_NOTNAM = 118,
+    E_NAVAIL = 119,
+    E_ISNAM = 120,
+    E_REMOTEIO = 121,
+    E_DQUOT = 122,
+    E_NOMEDIUM = 123,
+    E_MEDIUMTYPE = 124,
+    E_CANCELED = 125,
+    E_NOKEY = 126,
+    E_KEYEXPIRED = 127,
+    E_KEYREVOKED = 128,
+    E_KEYREJECTED = 129,
+    E_OWNERDEAD = 130,
+    E_NOTRECOVERABLE = 131,
+    E_RFKILL = 132,
+    E_HWPOISON = 133,
+    E_PROCLIM = 156,
+};
+
+enum class GetAddrInfoError : s32 {
+    SUCCESS = 0,
+    ADDRFAMILY = 1,
+    AGAIN = 2,
+    BADFLAGS = 3,
+    FAIL = 4,
+    FAMILY = 5,
+    MEMORY = 6,
+    NODATA = 7,
+    NONAME = 8,
+    SERVICE = 9,
+    SOCKTYPE = 10,
+    SYSTEM = 11,
+    BADHINTS = 12,
+    PROTOCOL = 13,
+    OVERFLOW_ = 14, // avoid name collision with Windows macro
+    OTHER = 15,
+};
+
+enum class Domain : u32 {
+    Unspecified = 0,
+    UNIX = 1,
+    INET = 2,
+    IMPLINK = 3,
+    PUP = 4,
+    CHAOS = 5,
+    NETBIOS = 6,
+    ISO = 7,
+    ECMA = 8,
+    DATAKIT = 9,
+    CCITT = 10,
+    SNA = 11,
+    DECnet = 12,
+    DLI = 13,
+    LAT = 14,
+    HYLINK = 15,
+    APPLETALK = 16,
+    ROUTE = 17,
+    LINK = 18,
+    COIP = 20,
+    CNT = 21,
+    IPX = 23,
+    SIP = 24,
+    ISDN = 26,
+    INET6 = 28,
+    NATM = 29,
+    ATM = 30,
+    NETGRAPH = 32,
+    SLOW = 33,
+    SCLUSTER = 34,
+    ARP = 35,
+    BLUETOOTH = 36,
+    IEEE80211 = 37,
+    NETLINK = 38,
+    INET_SDP = 40,
+    INET6_SDP = 42,
+};
+
+enum class Type : u32 {
+    Unspecified = 0,
+    STREAM = 1,
+    DGRAM = 2,
+    RAW = 3,
+    RDM = 4,
+    SEQPACKET = 5,
+};
+
+enum class Protocol : u32 {
+    IP = 0,
+    ICMP = 1,
+    TCP = 6,
+    UDP = 17,
+    //
+    IPV6 = 41,
+    RAW = 255,
+    //
+    HOPOPTS = 0,
+    IGMP = 2,
+    GGP = 3,
+    IPV4 = 4,
+    ST = 7,
+    EGP = 8,
+    PIGP = 9,
+    RCCMON = 10,
+    NVPII = 11,
+    PUP = 12,
+    ARGUS = 13,
+    EMCON = 14,
+    XNET = 15,
+    CHAOS = 16,
+    MUX = 18,
+    MEAS = 19,
+    HMP = 20,
+    PRM = 21,
+    IDP = 22,
+    TRUNK1 = 23,
+    TRUNK2 = 24,
+    LEAF1 = 25,
+    LEAF2 = 26,
+    RDP = 27,
+    IRTP = 28,
+    TP = 29,
+    BLT = 30,
+    NSP = 31,
+    INP = 32,
+    DCCP = 33,
+    //3PC = 34,
+    IDPR = 35,
+    XTP = 36,
+    DDP = 37,
+    CMTP = 38,
+    TPXX = 39,
+    IL = 40,
+    SDRP = 42,
+    ROUTING = 43,
+    FRAGMENT = 44,
+    IDRP = 45,
+    RSVP = 46,
+    GRE = 47,
+    MHRP = 48,
+    BHA = 49,
+    ESP = 50,
+    AH = 51,
+    INLSP = 52,
+    SWIPE = 53,
+    NHRP = 54,
+    MOBILE = 55,
+    TLSP = 56,
+    SKIP = 57,
+    ICMPV6 = 58,
+    NONE = 59,
+    DSTOPTS = 60,
+    AHIP = 61,
+    CFTP = 62,
+    HELLO = 63,
+    SATEXPAK = 64,
+    KRYPTOLAN = 65,
+    RVD = 66,
+    IPPC = 67,
+    ADFS = 68,
+    SATMON = 69,
+    VISA = 70,
+    IPCV = 71,
+    CPNX = 72,
+    CPHB = 73,
+    WSN = 74,
+    PVP = 75,
+    BRSATMON = 76,
+    ND = 77,
+    WBMON = 78,
+    WBEXPAK = 79,
+    EON = 80,
+    VMTP = 81,
+    SVMTP = 82,
+    VINES = 83,
+    TTP = 84,
+    IGP = 85,
+    DGP = 86,
+    TCF = 87,
+    IGRP = 88,
+    OSPFIGP = 89,
+    SRPC = 90,
+    LARP = 91,
+    MTP = 92,
+    AX25 = 93,
+    IPEIP = 94,
+    MICP = 95,
+    SCCSP = 96,
+    ETHERIP = 97,
+    ENCAP = 98,
+    APES = 99,
+    GMTP = 100,
+    IPCOMP = 108,
+    SCTP = 132,
+    MH = 135,
+    UDPLITE = 136,
+    HIP = 139,
+    SHIM6 = 140,
+    PIM = 103,
+    CARP = 112,
+    PGM = 113,
+    MPLS = 137,
+    PFSYNC = 240,
+};
+
+enum class SocketLevel : u32 {
+    IP = 0,
+    ICMP = 1,
+    TCP = 6,
+    UDP = 17,
+    CONFIG = 0xfffe,
+    SOCKET = 0xffff, // i.e. SOL_SOCKET
+};
+
+enum class MsgOpt : u32 {
+    OOB = 0x00001,
+    PEEK = 0x00002,
+    DONTROUTE = 0x00004,
+    EOR_ = 0x00008,
+    TRUNC = 0x00010,
+    CTRUNC = 0x00020,
+    WAITALL = 0x00040,
+    DONTWAIT = 0x00080,
+    EOF_ = 0x00100,
+    NOSIGNAL = 0x20000,
+};
+
+enum class OptName : u32 {
+    DEBUG = 0x0001,
+    ACCEPTCONN = 0x0002,
+    REUSEADDR = 0x0004,
+    KEEPALIVE = 0x0008,
+    DONTROUTE = 0x0010,
+    BROADCAST = 0x0020,
+    USELOOPBACK = 0x0040,
+    LINGER = 0x0080,
+    OOBINLINE = 0x0100,
+    REUSEPORT = 0x0200,
+    TIMESTAMP = 0x0400,
+    NOSIGPIPE = 0x0800, // at least according to libnx
+    ACCEPTFILER = 0x1000,
+    SNDBUF = 0x1001,
+    RCVBUF = 0x1002,
+    SNDTIMEO = 0x1005,
+    RCVTIMEO = 0x1006,
+    ERROR_ = 0x1007,   // avoid name collision with Windows macro
+    ACCEPTFILTER = 0x1000,
+    BINTIME = 0x2000,
+    NO_OFFLOAD = 0x4000,
+    NO_DDP = 0x8000,
+};
+enum class TcpOptName : u32 {
+    NODELAY = 0x0001,
+    MAXSEG = 0x0002,
+    NOPUSH = 0x0004,
+    NOOPT = 0x0008,
+    MS5SIG = 0x0010,
+    INFO = 0x0020
+};
+
+enum class ShutdownHow : s32 {
+    RD = 0,
+    WR = 1,
+    RDWR = 2,
+};
+
+enum class FcntlCmd : s32 {
+    GETFL = 3,
+    SETFL = 4,
+};
+
+enum class FcntlFlags : u32 {
+    NONBLOCK = 0x004,
+    NONBLOCK_NX = 0x800,
+    // Provided for convenience
+    NONBLOCK_ANY = u32(NONBLOCK) | u32(NONBLOCK_NX),
+};
+
+/// Array of IPv4 address
+using IPv4Address = std::array<u8, 4>;
+
+struct SockAddrIn {
+    u8 len;
+    u8 family;
+    u16 portno;
+    IPv4Address ip;
+    std::array<u8, 248> zeroes;
+};
+static_assert(sizeof(SockAddrIn) == 0x100);
+
+enum class PollEvents : u16 {
+    // Using Pascal case because IN is a macro on Windows.
+    IN_ = 0x0001,
+    PRI_ = 0x0002,
+    OUT_ = 0x0004,
+    ERR_ = 0x0008,
+    HUP_ = 0x0010,
+    NVAL = 0x0020,
+    RDNORM = 0x0040,
+    RDBAND = 0x0080,
+    WRBAND = 0x0100,
+    IGNEOF = 0x2000,
+};
+DECLARE_ENUM_FLAG_OPERATORS(PollEvents);
+
+struct PollFD {
+    s32 fd;
+    Network::PollEvents events;
+    Network::PollEvents revents;
+};
+static_assert(sizeof(PollFD) == 8);
+
+struct Linger {
+    s32 onoff;
+    s32 linger;
+};
+static_assert(sizeof(Linger) == 8);
+
+struct Timeval {
+    u64 tv_sec;
+    u64 tv_usec;
+};
+static_assert(sizeof(Timeval) == 16);
+
+/// @brief Cross-platform addrinfo structure (not guest)
+struct AddrInfo {
+    Domain family;
+    Type socket_type;
+    Protocol protocol;
+    SockAddrIn addr;
+    std::optional<std::string> canon_name;
+};
+
+} // namespace Network

src/core/internal_network/sockets.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -30,7 +30,7 @@ public:
 
     struct AcceptResult {
         std::unique_ptr<SocketBase> socket;
-        SockAddrIn sockaddr_in;
+        Network::SockAddrIn sockaddr_in;
     };
 
     SocketBase() = default;
@@ -46,13 +46,13 @@ public:
 
     virtual std::pair<AcceptResult, Errno> Accept() = 0;
 
-    virtual Errno Connect(SockAddrIn addr_in) = 0;
+    virtual Errno Connect(Network::SockAddrIn addr_in) = 0;
 
-    virtual std::pair<SockAddrIn, Errno> GetPeerName() = 0;
+    virtual std::pair<Network::SockAddrIn, Errno> GetPeerName() = 0;
 
-    virtual std::pair<SockAddrIn, Errno> GetSockName() = 0;
+    virtual std::pair<Network::SockAddrIn, Errno> GetSockName() = 0;
 
-    virtual Errno Bind(SockAddrIn addr) = 0;
+    virtual Errno Bind(Network::SockAddrIn addr) = 0;
 
     virtual Errno Listen(s32 backlog) = 0;
 
@@ -60,31 +60,16 @@ public:
 
     virtual std::pair<s32, Errno> Recv(int flags, std::span<u8> message) = 0;
 
-    virtual std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, SockAddrIn* addr) = 0;
+    virtual std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) = 0;
 
     virtual std::pair<s32, Errno> Send(std::span<const u8> message, int flags) = 0;
 
-    virtual std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message,
-                                         const SockAddrIn* addr) = 0;
-
-    virtual Errno SetLinger(bool enable, u32 linger) = 0;
-
-    virtual Errno SetReuseAddr(bool enable) = 0;
-
-    virtual Errno SetKeepAlive(bool enable) = 0;
-
-    virtual Errno SetBroadcast(bool enable) = 0;
-
-    virtual Errno SetSndBuf(u32 value) = 0;
-
-    virtual Errno SetRcvBuf(u32 value) = 0;
-
-    virtual Errno SetSndTimeo(u32 value) = 0;
-
-    virtual Errno SetRcvTimeo(u32 value) = 0;
+    virtual std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) = 0;
 
     virtual Errno SetNonBlock(bool enable) = 0;
 
+    virtual Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span<const u8> value) = 0;
+
     virtual std::pair<Errno, Errno> GetPendingError() = 0;
 
     virtual bool IsOpened() const = 0;
@@ -95,7 +80,6 @@ public:
         return fd;
     }
 
-protected:
     SOCKET fd = INVALID_SOCKET;
 };
 
@@ -114,13 +98,13 @@ public:
 
     std::pair<AcceptResult, Errno> Accept() override;
 
-    Errno Connect(SockAddrIn addr_in) override;
+    Errno Connect(Network::SockAddrIn addr_in) override;
 
-    std::pair<SockAddrIn, Errno> GetPeerName() override;
+    std::pair<Network::SockAddrIn, Errno> GetPeerName() override;
 
-    std::pair<SockAddrIn, Errno> GetSockName() override;
+    std::pair<Network::SockAddrIn, Errno> GetSockName() override;
 
-    Errno Bind(SockAddrIn addr) override;
+    Errno Bind(Network::SockAddrIn addr) override;
 
     Errno Listen(s32 backlog) override;
 
@@ -128,38 +112,19 @@ public:
 
     std::pair<s32, Errno> Recv(int flags, std::span<u8> message) override;
 
-    std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, SockAddrIn* addr) override;
+    std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) override;
 
     std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override;
 
-    std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message,
-                                 const SockAddrIn* addr) override;
-
-    Errno SetLinger(bool enable, u32 linger) override;
-
-    Errno SetReuseAddr(bool enable) override;
-
-    Errno SetKeepAlive(bool enable) override;
-
-    Errno SetBroadcast(bool enable) override;
-
-    Errno SetSndBuf(u32 value) override;
-
-    Errno SetRcvBuf(u32 value) override;
-
-    Errno SetSndTimeo(u32 value) override;
-
-    Errno SetRcvTimeo(u32 value) override;
+    std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) override;
 
     Errno SetNonBlock(bool enable) override;
 
-    template <typename T>
-    Errno SetSockOpt(SOCKET fd, int option, T value);
+    Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span<const u8> value) override;
 
     std::pair<Errno, Errno> GetPendingError() override;
 
-    template <typename T>
-    std::pair<T, Errno> GetSockOpt(SOCKET fd, int option);
+    Errno GetSockOpt(Network::SocketLevel level, Network::OptName optname, std::span<u8> value);
 
     bool IsOpened() const override;
 
@@ -169,6 +134,6 @@ private:
     bool is_non_blocking = false;
 };
 
-std::pair<s32, Errno> Poll(std::vector<PollFD>& poll_fds, s32 timeout);
+std::pair<s32, Errno> Poll(std::span<Network::HostPollFD> poll_fds, s32 timeout);
 
 } // namespace Network

src/network/room.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
@@ -12,7 +12,7 @@
 #include <vector>
 #include "common/announce_multiplayer_room.h"
 #include "common/common_types.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "network/verify_user.h"
 
 namespace Network {

src/network/room_member.cpp

@@ -10,7 +10,7 @@
 #include <thread>
 #include "common/assert.h"
 #include "common/polyfill_thread.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "enet/enet.h"
 #include "network/packet.h"
 #include "network/room_member.h"
@@ -358,19 +358,23 @@ void RoomMember::RoomMemberImpl::HandleProxyPackets(const ENetEvent* event) {
     // Parse the ProxyPacket from the packet
     u8 local_family;
     packet.Read(local_family);
-    proxy_packet.local_endpoint.family = static_cast<Domain>(local_family);
+    proxy_packet.local_endpoint.len = 16;
+    proxy_packet.local_endpoint.family = u8(Network::Domain(local_family));
     packet.Read(proxy_packet.local_endpoint.ip);
     packet.Read(proxy_packet.local_endpoint.portno);
+    proxy_packet.local_endpoint.zeroes = {};
 
     u8 remote_family;
     packet.Read(remote_family);
-    proxy_packet.remote_endpoint.family = static_cast<Domain>(remote_family);
+    proxy_packet.remote_endpoint.len = 16;
+    proxy_packet.remote_endpoint.family = u8(Network::Domain(remote_family));
     packet.Read(proxy_packet.remote_endpoint.ip);
     packet.Read(proxy_packet.remote_endpoint.portno);
+    proxy_packet.local_endpoint.zeroes = {};
 
     u8 protocol_type;
     packet.Read(protocol_type);
-    proxy_packet.protocol = static_cast<Protocol>(protocol_type);
+    proxy_packet.protocol = Network::Protocol(protocol_type);
 
     packet.Read(proxy_packet.broadcast);
     packet.Read(proxy_packet.data);

src/network/room_member.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2017 Citra Emulator Project
@@ -12,7 +12,7 @@
 #include <vector>
 #include "common/announce_multiplayer_room.h"
 #include "common/common_types.h"
-#include "common/socket_types.h"
+#include "core/internal_network/socket_types.h"
 #include "network/room.h"
 
 namespace Network {
@@ -39,8 +39,8 @@ struct LDNPacket {
 
 /// Information about the received proxy packets.
 struct ProxyPacket {
-    SockAddrIn local_endpoint;
-    SockAddrIn remote_endpoint;
+    Network::SockAddrIn local_endpoint;
+    Network::SockAddrIn remote_endpoint;
     Protocol protocol;
     bool broadcast;
     std::vector<u8> data;

src/tests/core/internal_network/network.cpp

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -12,16 +15,18 @@ TEST_CASE("Network::Errors", "[core]") {
     Network::Socket socks[2];
     for (Network::Socket& sock : socks) {
         REQUIRE(sock.Initialize(Network::Domain::INET, Network::Type::STREAM,
-                                Network::Protocol::TCP) == Network::Errno::SUCCESS);
+                                Network::Protocol::TCP) == Network::Errno::E_SUCCESS);
     }
 
     Network::SockAddrIn addr{
-        Network::Domain::INET,
-        {127, 0, 0, 1},
+        16,
+        u8(Network::Domain::INET),
         1, // hopefully nobody running this test has something listening on port 1
+        {127, 0, 0, 1},
+        {},
     };
-    REQUIRE(socks[0].Connect(addr) == Network::Errno::CONNREFUSED);
+    REQUIRE(socks[0].Connect(addr) == Network::Errno::E_CONNREFUSED);
 
     std::vector<u8> message{1, 2, 3, 4};
-    REQUIRE(socks[1].Recv(0, message).second == Network::Errno::NOTCONN);
+    REQUIRE(socks[1].Recv(0, message).second == Network::Errno::E_NOTCONN);
 }

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/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/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/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{

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_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_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();