Merge a8e453e1dc into da3f4e1d3a

* nuget: Bump System group to 9.0.2
* Clean up RuntimeIdentifiers in project files

.github/workflows/build.yml

@@ -19,6 +19,7 @@ jobs:
         configuration: [Debug, Release]
         platform:
           - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
           - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
           - { name: osx-x64,     os: macos-13,       zip_os_name: osx_x64     }

.github/workflows/canary.yml

@@ -62,6 +62,7 @@ jobs:
             | Platform | Artifact |
             |--|--|
             | Windows 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_x64.zip) |
+            | Windows ARM 64-bit | [Canary Windows Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-win_arm64.zip) |
             | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
             | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
             | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
@@ -79,6 +80,7 @@ jobs:
       matrix:
         platform:
           - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
           - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
     steps:
@@ -122,7 +124,6 @@ jobs:
         if: matrix.platform.os == 'windows-latest'
         run: |
           pushd publish
-          rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
           popd
         shell: bash
@@ -131,7 +132,6 @@ jobs:
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
           pushd publish
-          rm libarmeilleure-jitsupport.dylib
           chmod +x Ryujinx.sh Ryujinx
           tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish
           popd

.github/workflows/release.yml

@@ -65,6 +65,7 @@ jobs:
       matrix:
         platform:
           - { name: win-x64,     os: windows-latest, zip_os_name: win_x64     }
+          - { name: win-arm64,   os: windows-latest, zip_os_name: win_arm64   }
           - { name: linux-x64,   os: ubuntu-latest,  zip_os_name: linux_x64   }
           - { name: linux-arm64, os: ubuntu-latest,  zip_os_name: linux_arm64 }
     steps:
@@ -107,7 +108,6 @@ jobs:
         if: matrix.platform.os == 'windows-latest'
         run: |
           pushd publish
-          rm libarmeilleure-jitsupport.dylib
           7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip ../publish
           popd
         shell: bash

Directory.Packages.props

@@ -39,7 +39,7 @@
     <PackageVersion Include="OpenTK.Windowing.GraphicsLibraryFramework" Version="4.8.2" />
     <PackageVersion Include="Open.NAT.Core" Version="2.1.0.5" />
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
-    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
+    <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="Gommon" Version="2.7.1.1" />
@@ -53,8 +53,8 @@
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
-    <PackageVersion Include="System.Management" Version="9.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
+    <PackageVersion Include="System.Management" Version="9.0.2" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
   </ItemGroup>
 </Project>

src/ARMeilleure/ARMeilleure.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ContentWithTargetPath Include="Native\libs\libarmeilleure-jitsupport.dylib" Condition="'$(RuntimeIdentifier)' == '' OR '$(RuntimeIdentifier)' == 'osx-arm64'">
+    <ContentWithTargetPath Include="Native\libs\libarmeilleure-jitsupport.dylib" Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libarmeilleure-jitsupport.dylib</TargetPath>
     </ContentWithTargetPath>

src/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64</RuntimeIdentifiers>
     <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
   </PropertyGroup>
 
@@ -11,15 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dll" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsoundio.dll</TargetPath>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.dylib" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsoundio.dylib</TargetPath>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
+    <ContentWithTargetPath Include="Native\libsoundio\libs\libsoundio.so" Condition="'$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64' AND '$(RuntimeIdentifier)' != 'linux-arm64'">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsoundio.so</TargetPath>
     </ContentWithTargetPath>

src/Ryujinx.Graphics.GAL/IRenderer.cs

@@ -1,6 +1,4 @@
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.GAL.Multithreading;
 using System;
 using System.Threading;
 
@@ -12,20 +10,6 @@ namespace Ryujinx.Graphics.GAL
 
         bool PreferThreading { get; }
 
-        public IRenderer TryMakeThreaded(BackendThreading backendThreading = BackendThreading.Auto)
-        {
-            if (backendThreading is BackendThreading.On ||
-                (backendThreading is BackendThreading.Auto && PreferThreading))
-            {
-                Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): True");
-                return new ThreadedRenderer(this);
-            }
-            
-            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): False");
-
-            return this;
-        }
-
         IPipeline Pipeline { get; }
 
         IWindow Window { get; }

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs

@@ -12,8 +12,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 
         private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
         {
-            { AvCodecLibraryName, (58, 59) },
-            { AvUtilLibraryName, (56, 57) },
+            { AvCodecLibraryName, (58, 61) },
+            { AvUtilLibraryName, (56, 59) },
         };
 
         private static string FormatLibraryNameForCurrentOs(string libraryName, int version)

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -15,55 +15,55 @@ namespace Ryujinx.HLE
     /// <summary>
     /// HLE configuration.
     /// </summary>
-    public class HleConfiguration
+    public class HLEConfiguration
     {
         /// <summary>
         /// The virtual file system used by the FS service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal VirtualFileSystem VirtualFileSystem { get; private set; }
+        internal readonly VirtualFileSystem VirtualFileSystem;
 
         /// <summary>
         /// The manager for handling a LibHac Horizon instance.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal LibHacHorizonManager LibHacHorizonManager { get; private set; }
+        internal readonly LibHacHorizonManager LibHacHorizonManager;
 
         /// <summary>
         /// The account manager used by the account service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal AccountManager AccountManager { get; private set; }
+        internal readonly AccountManager AccountManager;
 
         /// <summary>
         /// The content manager used by the NCM service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal ContentManager ContentManager { get; private set; }
+        internal readonly ContentManager ContentManager;
 
         /// <summary>
         /// The persistent information between run for multi-application capabilities.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        public UserChannelPersistence UserChannelPersistence { get; private set; }
+        public readonly UserChannelPersistence UserChannelPersistence;
 
         /// <summary>
         /// The GPU renderer to use for all GPU operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IRenderer GpuRenderer { get; private set; }
+        internal readonly IRenderer GpuRenderer;
 
         /// <summary>
         /// The audio device driver to use for all audio operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IHardwareDeviceDriver AudioDeviceDriver { get; private set; }
+        internal readonly IHardwareDeviceDriver AudioDeviceDriver;
 
         /// <summary>
         /// The handler for various UI related operations needed outside of HLE.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal IHostUIHandler HostUIHandler { get; private set; }
+        internal readonly IHostUIHandler HostUIHandler;
 
         /// <summary>
         /// Control the memory configuration used by the emulation context.
@@ -195,7 +195,15 @@ namespace Ryujinx.HLE
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
         public EnabledDirtyHack[] Hacks { internal get; set; }
 
-        public HleConfiguration(MemoryConfiguration memoryConfiguration,
+        public HLEConfiguration(VirtualFileSystem virtualFileSystem,
+                                LibHacHorizonManager libHacHorizonManager,
+                                ContentManager contentManager,
+                                AccountManager accountManager,
+                                UserChannelPersistence userChannelPersistence,
+                                IRenderer gpuRenderer,
+                                IHardwareDeviceDriver audioDeviceDriver,
+                                MemoryConfiguration memoryConfiguration,
+                                IHostUIHandler hostUIHandler,
                                 SystemLanguage systemLanguage,
                                 RegionCode region,
                                 VSyncMode vSyncMode,
@@ -219,7 +227,15 @@ namespace Ryujinx.HLE
                                 int customVSyncInterval,
                                 EnabledDirtyHack[] dirtyHacks = null)
         {
+            VirtualFileSystem = virtualFileSystem;
+            LibHacHorizonManager = libHacHorizonManager;
+            AccountManager = accountManager;
+            ContentManager = contentManager;
+            UserChannelPersistence = userChannelPersistence;
+            GpuRenderer = gpuRenderer;
+            AudioDeviceDriver = audioDeviceDriver;
             MemoryConfiguration = memoryConfiguration;
+            HostUIHandler = hostUIHandler;
             SystemLanguage = systemLanguage;
             Region = region;
             VSyncMode = vSyncMode;
@@ -243,30 +259,5 @@ namespace Ryujinx.HLE
             MultiplayerLdnServer = multiplayerLdnServer;
             Hacks = dirtyHacks ?? [];
         }
-
-        /// <summary>
-        /// Set the pre-configured services to use for this <see cref="HleConfiguration"/> instance.
-        /// </summary>
-        public HleConfiguration Configure(
-            VirtualFileSystem virtualFileSystem,
-            LibHacHorizonManager libHacHorizonManager,
-            ContentManager contentManager,
-            AccountManager accountManager,
-            UserChannelPersistence userChannelPersistence,
-            IRenderer gpuRenderer,
-            IHardwareDeviceDriver audioDeviceDriver,
-            IHostUIHandler hostUIHandler
-        )
-        {
-            VirtualFileSystem = virtualFileSystem;
-            LibHacHorizonManager = libHacHorizonManager;
-            AccountManager = accountManager;
-            ContentManager = contentManager;
-            UserChannelPersistence = userChannelPersistence;
-            GpuRenderer = gpuRenderer;
-            AudioDeviceDriver = audioDeviceDriver;
-            HostUIHandler = hostUIHandler;
-            return this;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
 
         private readonly LanDiscovery _lanDiscovery;
 
-        public LdnMitmClient(HleConfiguration config)
+        public LdnMitmClient(HLEConfiguration config)
         {
             UnicastIPAddressInformation localIpInterface = NetworkHelpers.GetLocalInterface(config.MultiplayerLanInterfaceId).Item2;
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -51,13 +51,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
         private string _passphrase;
         private byte[] _gameVersion = new byte[0x10];
 
-        private readonly HleConfiguration _config;
+        private readonly HLEConfiguration _config;
 
         public event EventHandler<NetworkChangeEventArgs> NetworkChange;
 
         public ProxyConfig Config { get; private set; }
 
-        public LdnMasterProxyClient(string address, int port, HleConfiguration config) : base(address, port)
+        public LdnMasterProxyClient(string address, int port, HLEConfiguration config) : base(address, port)
         {
             if (ProxyHelpers.SupportsNoDelay())
             {

src/Ryujinx.HLE/Switch.cs

@@ -20,7 +20,7 @@ namespace Ryujinx.HLE
     {
         public static Switch Shared { get; private set; }
         
-        public HleConfiguration Configuration { get; }
+        public HLEConfiguration Configuration { get; }
         public IHardwareDeviceDriver AudioDeviceDriver { get; }
         public MemoryBlock Memory { get; }
         public GpuContext Gpu { get; }
@@ -44,7 +44,7 @@ namespace Ryujinx.HLE
 
         public DirtyHacks DirtyHacks { get; }
 
-        public Switch(HleConfiguration configuration)
+        public Switch(HLEConfiguration configuration)
         {
             ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
             ArgumentNullException.ThrowIfNull(configuration.AudioDeviceDriver);
@@ -94,20 +94,16 @@ namespace Ryujinx.HLE
             Gpu.GPFifo.DispatchCalls();
         }
 
-        public int IncrementCustomVSyncInterval()
+        public void IncrementCustomVSyncInterval()
         {
             CustomVSyncInterval += 1;
             UpdateVSyncInterval();
-
-            return CustomVSyncInterval;
         }
 
-        public int DecrementCustomVSyncInterval()
+        public void DecrementCustomVSyncInterval()
         {
             CustomVSyncInterval -= 1;
             UpdateVSyncInterval();
-
-            return CustomVSyncInterval;
         }
 
         public void UpdateVSyncInterval()

src/Ryujinx/AppHost.cs

@@ -902,19 +902,53 @@ namespace Ryujinx.Ava
                 _ => new OpenGLRenderer()
             };
 
+            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
+
+            bool isGALThreaded = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+            if (isGALThreaded)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALThreaded}");
+
             // Initialize Configuration.
-            Device = new Switch(ConfigurationState.Instance.CreateHleConfiguration()
-                .Configure(
-                    VirtualFileSystem,
-                    _viewModel.LibHacHorizonManager,
-                    ContentManager,
-                    _accountManager,
-                    _userChannelPersistence,
-                    renderer.TryMakeThreaded(ConfigurationState.Instance.Graphics.BackendThreading),
-                    InitializeAudio(),
-                    _viewModel.UiHandler
-                )
-            );
+            MemoryConfiguration memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
+
+            Device = new Switch(new HLEConfiguration(
+                VirtualFileSystem,
+                _viewModel.LibHacHorizonManager,
+                ContentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                InitializeAudio(),
+                memoryConfiguration,
+                _viewModel.UiHandler,
+                (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
+                (RegionCode)ConfigurationState.Instance.System.Region.Value,
+                ConfigurationState.Instance.Graphics.VSyncMode,
+                ConfigurationState.Instance.System.EnableDockedMode,
+                ConfigurationState.Instance.System.EnablePtc,
+                ConfigurationState.Instance.System.EnableInternetAccess,
+                ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                ConfigurationState.Instance.System.FsGlobalAccessLogMode,
+                ConfigurationState.Instance.System.MatchSystemTime 
+                    ? 0 
+                    : ConfigurationState.Instance.System.SystemTimeOffset,
+                ConfigurationState.Instance.System.TimeZone,
+                ConfigurationState.Instance.System.MemoryManagerMode,
+                ConfigurationState.Instance.System.IgnoreMissingServices,
+                ConfigurationState.Instance.Graphics.AspectRatio,
+                ConfigurationState.Instance.System.AudioVolume,
+                ConfigurationState.Instance.System.UseHypervisor,
+                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
+                ConfigurationState.Instance.Multiplayer.Mode,
+                ConfigurationState.Instance.Multiplayer.DisableP2p,
+                ConfigurationState.Instance.Multiplayer.LdnPassphrase,
+                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
+                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
+                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
         }
 
         private static IHardwareDeviceDriver InitializeAudio()
@@ -1148,9 +1182,6 @@ namespace Ryujinx.Ava
 
         private void UpdateShaderCount()
         {
-            if (_displayCount is 0 && _renderer.ProgramCount is 0)
-                return;
-            
             // If there is a mismatch between total program compile and previous count
             // this means new shaders have been compiled and should be displayed.
             if (_renderer.ProgramCount != _previousCount)
@@ -1224,10 +1255,12 @@ namespace Ryujinx.Ava
                             VSyncModeToggle();
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalDecrement:
-                            _viewModel.CustomVSyncInterval = Device.DecrementCustomVSyncInterval();
+                            Device.DecrementCustomVSyncInterval();
+                            _viewModel.CustomVSyncInterval -= 1;
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
-                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
+                            Device.IncrementCustomVSyncInterval();
+                            _viewModel.CustomVSyncInterval += 1;
                             break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;

src/Ryujinx/Common/ApplicationHelper.cs

@@ -13,7 +13,7 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.Configuration;

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -312,42 +312,49 @@ namespace Ryujinx.Headless
             return new OpenGLRenderer();
         }
 
-        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
-            new(
-                new HleConfiguration(
-                        options.DramSize,
-                        options.SystemLanguage,
-                        options.SystemRegion,
-                        options.VSyncMode,
-                        !options.DisableDockedMode,
-                        !options.DisablePTC,
-                        options.EnableInternetAccess,
-                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                        options.FsGlobalAccessLogMode,
-                        options.SystemTimeOffset,
-                        options.SystemTimeZone,
-                        options.MemoryManagerMode,
-                        options.IgnoreMissingServices,
-                        options.AspectRatio,
-                        options.AudioVolume,
-                        options.UseHypervisor ?? true,
-                        options.MultiplayerLanInterfaceId,
-                        Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
-                        false,
-                        string.Empty,
-                        string.Empty,
-                        options.CustomVSyncInterval
-                    )
-                    .Configure(
-                        _virtualFileSystem,
-                        _libHacHorizonManager,
-                        _contentManager,
-                        _accountManager,
-                        _userChannelPersistence,
-                        renderer.TryMakeThreaded(options.BackendThreading),
-                        new SDL2HardwareDeviceDriver(),
-                        window
-                    )
-            );
+        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options)
+        {
+            BackendThreading threadingMode = options.BackendThreading;
+
+            bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
+
+            if (threadedGAL)
+            {
+                renderer = new ThreadedRenderer(renderer);
+            }
+
+            HLEConfiguration configuration = new(_virtualFileSystem,
+                _libHacHorizonManager,
+                _contentManager,
+                _accountManager,
+                _userChannelPersistence,
+                renderer,
+                new SDL2HardwareDeviceDriver(),
+                options.DramSize,
+                window,
+                options.SystemLanguage,
+                options.SystemRegion,
+                options.VSyncMode,
+                !options.DisableDockedMode,
+                !options.DisablePTC,
+                options.EnableInternetAccess,
+                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                options.FsGlobalAccessLogMode,
+                options.SystemTimeOffset,
+                options.SystemTimeZone,
+                options.MemoryManagerMode,
+                options.IgnoreMissingServices,
+                options.AspectRatio,
+                options.AudioVolume,
+                options.UseHypervisor ?? true,
+                options.MultiplayerLanInterfaceId,
+                Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
+                false,
+                string.Empty,
+                string.Empty,
+                options.CustomVSyncInterval);
+
+            return new Switch(configuration);
+        }
     }
 }

src/Ryujinx/Ryujinx.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;win-arm64;osx-arm64;linux-arm64;</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Version>1.0.0-dirty</Version>
@@ -29,12 +29,18 @@
     <TrimMode>partial</TrimMode>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-arm64'">
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishTrimmed>false</PublishTrimmed>
+  </PropertyGroup>
+  
   <!--
     FluentAvalonia, used in the Avalonia UI, requires a workaround for the json serializer used internally when using .NET 8+ System.Text.Json.
     See:
       https://github.com/amwx/FluentAvalonia/issues/481
       https://devblogs.microsoft.com/dotnet/system-text-json-in-dotnet-8/
   -->
+  
   <PropertyGroup>
     <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
@@ -57,8 +63,8 @@
     <PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" />
     <PackageReference Include="OpenTK.Core" />
     <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'" />
-    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies" />
-    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64'" />
+    <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" />
+    <PackageReference Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64'" />
     <PackageReference Include="securifybv.ShellLink" />
     <PackageReference Include="Sep" />
     <PackageReference Include="Silk.NET.Vulkan" />
@@ -67,7 +73,7 @@
     <PackageReference Include="SPB" />
     <PackageReference Include="SharpZipLib" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL2\Ryujinx.Audio.Backends.SDL2.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
@@ -84,7 +90,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'">
+    <Content Include="..\..\distribution\windows\alsoft.ini" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64' AND '$(RuntimeIdentifier)' != 'osx-arm64'">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <TargetPath>alsoft.ini</TargetPath>
     </Content>

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -9,7 +9,6 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;

src/Ryujinx/UI/Controls/ApplicationDataView.axaml

@@ -7,7 +7,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
              x:DataType="viewModels:ApplicationDataViewModel">
     <StackPanel Orientation="Horizontal">
         <Image Margin="0"

src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs

@@ -4,7 +4,6 @@ using Avalonia.Interactivity;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
@@ -13,7 +12,7 @@ using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Controls
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {

src/Ryujinx/UI/Controls/ApplicationGridView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationGridView"
+    x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"

src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs

@@ -1,13 +1,12 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Controls
 {
     public partial class ApplicationGridView : RyujinxControl<MainWindowViewModel>
     {

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationListView"
+    x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs

@@ -2,7 +2,6 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -10,7 +9,7 @@ using Ryujinx.Ava.Utilities.Compat;
 using System;
 using System.Linq;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Controls
 {
     public partial class ApplicationListView : RyujinxControl<MainWindowViewModel>
     {

src/Ryujinx/UI/Controls/DlcSelectView.axaml

@@ -7,7 +7,7 @@
              xmlns:models="using:Ryujinx.Ava.Common.Models"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Controls.DlcSelectView"
              x:DataType="viewModels:DlcSelectViewModel">
     <Grid RowDefinitions="*,Auto,*">
         <TextBlock

src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs

@@ -3,13 +3,12 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Views.Misc
+namespace Ryujinx.Ava.UI.Controls
 {
     public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
     {

src/Ryujinx/UI/Controls/RyujinxControl.cs

@@ -9,15 +9,9 @@ namespace Ryujinx.Ava.UI.Controls
     {
         public TViewModel ViewModel
         {
-            get
-            {
-                if (DataContext is not TViewModel viewModel)
-                    throw new InvalidOperationException(
-                        $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
-                        $"Actual type is {DataContext?.GetType().AsPrettyString()}");
-
-                return viewModel;
-            }
+            get => (TViewModel)DataContext ?? throw new InvalidOperationException(
+                $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
+                $"Actual type is {DataContext?.GetType().AsPrettyString()}");
             set => DataContext = value;
         }
     }

src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="Ryujinx.Ava.UI.Windows.UpdateWaitWindow"
+    x:Class="Ryujinx.Ava.UI.Controls.UpdateWaitWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs

@@ -1,7 +1,8 @@
 using Avalonia.Controls;
+using Ryujinx.Ava.UI.Windows;
 using System.Threading;
 
-namespace Ryujinx.Ava.UI.Windows
+namespace Ryujinx.Ava.UI.Controls
 {
     public partial class UpdateWaitWindow : StyleableWindow
     {

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -40,19 +40,19 @@ namespace Ryujinx.Ava.UI.Helpers
                 SecondaryButtonText = secondaryButton,
                 CloseButtonText = closeButton,
                 Content = content,
-                PrimaryButtonCommand = Commands.Create(() =>
+                PrimaryButtonCommand = MiniCommand.Create(() =>
                 {
                     result = primaryButtonResult;
                 })
             };
 
-            contentDialog.SecondaryButtonCommand = Commands.Create(() =>
+            contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
             {
                 result = UserResult.No;
                 contentDialog.PrimaryButtonClick -= deferCloseAction;
             });
 
-            contentDialog.CloseButtonCommand = Commands.Create(() =>
+            contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
             {
                 result = UserResult.Cancel;
                 contentDialog.PrimaryButtonClick -= deferCloseAction;

src/Ryujinx/UI/Helpers/MiniCommand.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+    public sealed class MiniCommand<T> : MiniCommand, ICommand
+    {
+        private readonly Action<T> _callback;
+        private bool _busy;
+        private readonly Func<T, Task> _asyncCallback;
+
+        public MiniCommand(Action<T> callback)
+        {
+            _callback = callback;
+        }
+
+        public MiniCommand(Func<T, Task> callback)
+        {
+            _asyncCallback = callback;
+        }
+
+        private bool Busy
+        {
+            get => _busy;
+            set
+            {
+                _busy = value;
+                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public override event EventHandler CanExecuteChanged;
+        public override bool CanExecute(object parameter) => !_busy;
+
+        public override async void Execute(object parameter)
+        {
+            if (Busy)
+            {
+                return;
+            }
+            try
+            {
+                Busy = true;
+                if (_callback != null)
+                {
+                    _callback((T)parameter);
+                }
+                else
+                {
+                    await _asyncCallback((T)parameter);
+                }
+            }
+            finally
+            {
+                Busy = false;
+            }
+        }
+    }
+
+    public abstract class MiniCommand : ICommand
+    {
+        public static MiniCommand Create(Action callback) => new MiniCommand<object>(_ => callback());
+        public static MiniCommand Create<TArg>(Action<TArg> callback) => new MiniCommand<TArg>(callback);
+        public static MiniCommand CreateFromTask(Func<Task> callback) => new MiniCommand<object>(_ => callback());
+        public static MiniCommand CreateFromTask<TArg>(Func<TArg, Task> callback) => new MiniCommand<TArg>(callback);
+
+        public abstract bool CanExecute(object parameter);
+        public abstract void Execute(object parameter);
+        public abstract event EventHandler CanExecuteChanged;
+    }
+}

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -73,7 +73,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                     {
                         Content = $".{it.FileName}",
                         IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
-                        Command = Commands.Create(() => Window.ToggleFileType(it.FileName))
+                        Command = MiniCommand.Create(() => Window.ToggleFileType(it.FileName))
                     }
                 );
 
@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                     Margin = new Thickness(3, 0, 3, 0),
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     Header = languageName,
-                    Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(language))
+                    Command = MiniCommand.Create(() => MainWindowViewModel.ChangeLanguage(language))
                 };
 
                 yield return menuItem;

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -9,7 +9,6 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:main="clr-namespace:Ryujinx.Ava.UI.Views.Main"
-    xmlns:viewsMisc="clr-namespace:Ryujinx.Ava.UI.Views.Misc"
     Cursor="{Binding Cursor}"
     Title="{Binding Title}"
     WindowState="{Binding WindowState}"
@@ -74,7 +73,7 @@
                     <main:MainViewControls
                         Name="ViewControls"
                         Grid.Row="0"/>
-                    <viewsMisc:ApplicationListView
+                    <controls:ApplicationListView
                         x:Name="ApplicationList"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"
@@ -82,7 +81,7 @@
                         HorizontalContentAlignment="Stretch"
                         VerticalContentAlignment="Stretch"
                         IsVisible="{Binding IsList}" />
-                    <viewsMisc:ApplicationGridView
+                    <controls:ApplicationGridView
                         x:Name="ApplicationGrid"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -1,6 +1,6 @@
 using ARMeilleure;
 using Gommon;
-using LibHac.Tools.FsSystem;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
@@ -11,7 +11,6 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
-using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
@@ -20,7 +19,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
-        /// <summary>
+                /// <summary>
         /// UI configuration section
         /// </summary>
         public class UISection
@@ -839,35 +838,5 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableHardwareAcceleration = new ReactiveObject<bool>();
             HideCursor = new ReactiveObject<HideCursorMode>();
         }
-
-        public HleConfiguration CreateHleConfiguration() =>
-            new(
-                System.DramSize,
-                (SystemLanguage)System.Language.Value,
-                (RegionCode)System.Region.Value,
-                Graphics.VSyncMode,
-                System.EnableDockedMode,
-                System.EnablePtc,
-                System.EnableInternetAccess,
-                System.EnableFsIntegrityChecks 
-                    ? IntegrityCheckLevel.ErrorOnInvalid 
-                    : IntegrityCheckLevel.None,
-                System.FsGlobalAccessLogMode,
-                System.MatchSystemTime
-                    ? 0
-                    : System.SystemTimeOffset,
-                System.TimeZone,
-                System.MemoryManagerMode,
-                System.IgnoreMissingServices,
-                Graphics.AspectRatio,
-                System.AudioVolume,
-                System.UseHypervisor,
-                Multiplayer.LanInterfaceId,
-                Multiplayer.Mode,
-                Multiplayer.DisableP2p,
-                Multiplayer.LdnPassphrase,
-                Instance.Multiplayer.GetLdnServer(),
-                Instance.Graphics.CustomVSyncInterval,
-                Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -327,5 +327,5 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             return GraphicsBackend.OpenGl;
         }
-    }
-}
+            }
+        }