small simplification

Added the `--backend-threading` arg so that you can launch games via
a shortcut with modifications to this setting.

Directory.Packages.props

@@ -3,7 +3,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Alimer.Bindings.SDL" Version="3.7.1" />
     <PackageVersion Include="Avalonia" Version="11.0.13" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />

Ryujinx.sln

@@ -75,8 +75,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon", "src\Ryuj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Horizon.Kernel.Generators", "src\Ryujinx.Horizon.Kernel.Generators\Ryujinx.Horizon.Kernel.Generators.csproj", "{7F55A45D-4E1D-4A36-ADD3-87F29A285AA2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Input.SDL3", "src\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj", "{3BF24278-547D-42C2-9D43-182B978F54DD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.HLE.Generators", "src\Ryujinx.HLE.Generators\Ryujinx.HLE.Generators.csproj", "{B575BCDE-2FD8-4A5D-8756-31CDD7FE81F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Metal", "src\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj", "{C08931FA-1191-417A-864F-3882D93E683B}"
@@ -261,10 +259,6 @@ Global
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81EA598C-DBA1-40B0-8DA4-4796B78F2037}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BF24278-547D-42C2-9D43-182B978F54DD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/JsonMotionConfigControllerConverter.cs

@@ -56,7 +56,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
             return motionBackendType switch
             {
                 MotionInputBackendType.GamepadDriver => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
-                MotionInputBackendType.Handheld => JsonSerializer.Deserialize(ref reader, _serializerContext.StandardMotionConfigController),
                 MotionInputBackendType.CemuHook => JsonSerializer.Deserialize(ref reader, _serializerContext.CemuHookMotionConfigController),
                 _ => throw new InvalidOperationException($"Unknown backend type {motionBackendType}"),
             };
@@ -67,7 +66,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
             switch (value.MotionBackend)
             {
                 case MotionInputBackendType.GamepadDriver:
-                case MotionInputBackendType.Handheld:
                     JsonSerializer.Serialize(writer, value as StandardMotionConfigController, _serializerContext.StandardMotionConfigController);
                     break;
                 case MotionInputBackendType.CemuHook:

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs

@@ -9,6 +9,5 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
         Invalid,
         GamepadDriver,
         CemuHook,
-        Handheld,
     }
 }

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -296,7 +296,7 @@ namespace Ryujinx.HLE.HOS
             AddModsFromDirectory(mods, applicationDir, modMetadata);
         }
 
-        public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong applicationId)
+        public static void QueryContentsDir(ModCache mods, DirectoryInfo contentsDir, ulong applicationId, ulong[] installedDlcs)
         {
             if (!contentsDir.Exists)
             {
@@ -311,6 +311,16 @@ namespace Ryujinx.HLE.HOS
             {
                 QueryApplicationDir(mods, applicationDir, applicationId);
             }
+
+            foreach (ulong installedDlcId in installedDlcs)
+            {
+                DirectoryInfo dlcModDir = FindApplicationDir(contentsDir, $"{installedDlcId:x16}");
+
+                if (dlcModDir != null)
+                {
+                    QueryApplicationDir(mods, dlcModDir, applicationId);
+                }
+            }
         }
 
         private static int QueryCheatsDir(ModCache mods, DirectoryInfo cheatsDir)
@@ -417,7 +427,7 @@ namespace Ryujinx.HLE.HOS
                 {
                     foreach ((ulong applicationId, ModCache cache) in modCaches)
                     {
-                        QueryContentsDir(cache, searchDir, applicationId);
+                        QueryContentsDir(cache, searchDir, applicationId, Array.Empty<ulong>());
                     }
 
                     return true;

src/Ryujinx.Input.SDL3/Ryujinx.Input.SDL3.csproj

@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
-    <PackageReference Include="Alimer.Bindings.SDL" />
-  </ItemGroup>
-
-</Project>

src/Ryujinx.Input.SDL3/SDL3MotionDriver.cs

@@ -1,85 +0,0 @@
-using SDL3;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using static SDL3.SDL3;
-
-namespace Ryujinx.Input.SDL3
-{
-    public unsafe class SDL3MotionDriver : IHandheld, IDisposable
-    {
-        private readonly Dictionary<SDL_SensorType, SDL_Sensor> sensors;
-        private bool _disposed;
-
-        public SDL3MotionDriver()
-        {
-            int result = SDL_Init(SDL_InitFlags.Sensor);
-            if (result < 0)
-            {
-                throw new InvalidOperationException($"SDL sensor initialization failed: {SDL_GetError()}");
-            }
-            sensors = SDL_GetSensors().ToArray().ToDictionary(SDL_GetSensorTypeForID, SDL_OpenSensor);
-        }
-
-        ~SDL3MotionDriver()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (disposing && sensors != null)
-            {
-                foreach (var sensor in sensors.Values)
-                {
-                    if (sensor != IntPtr.Zero)
-                    {
-                        SDL_CloseSensor(sensor);
-                    }
-                }
-            }
-
-            _disposed = true;
-        }
-
-        public Vector3 GetMotionData(MotionInputId inputType)
-        {
-            ObjectDisposedException.ThrowIf(_disposed, this);
-
-            return inputType switch
-            {
-                MotionInputId.Gyroscope => GetSensorVector(SDL_SensorType.Gyro) * 180 / MathF.PI,
-                MotionInputId.Accelerometer => GetSensorVector(SDL_SensorType.Accel) / SDL_STANDARD_GRAVITY,
-                _ => Vector3.Zero
-            };
-        }
-
-        private Vector3 GetSensorVector(SDL_SensorType sensorType)
-        {
-            if (!sensors.TryGetValue(sensorType, out SDL_Sensor sensor))
-            {
-                return Vector3.Zero;
-            }
-
-            var data = stackalloc float[3];
-            if (SDL_GetSensorData(sensor, data, 3) < 0)
-            {
-                return Vector3.Zero;
-            }
-
-            return new Vector3(data[0], data[1], data[2]);
-        }
-    }
-}

src/Ryujinx.Input/HLE/InputManager.cs

@@ -2,13 +2,12 @@ using System;
 
 namespace Ryujinx.Input.HLE
 {
-    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IHandheld handheld)
+    public class InputManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver)
         : IDisposable
     {
         public IGamepadDriver KeyboardDriver { get; } = keyboardDriver;
         public IGamepadDriver GamepadDriver { get; } = gamepadDriver;
         public IGamepadDriver MouseDriver { get; private set; }
-        public IHandheld Handheld { get; } = handheld;
 
         public void SetMouseDriver(IGamepadDriver mouseDriver)
         {
@@ -19,7 +18,7 @@ namespace Ryujinx.Input.HLE
 
         public NpadManager CreateNpadManager()
         {
-            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver, Handheld);
+            return new NpadManager(KeyboardDriver, GamepadDriver, MouseDriver);
         }
 
         public TouchScreenManager CreateTouchScreenManager()
@@ -39,7 +38,6 @@ namespace Ryujinx.Input.HLE
                 KeyboardDriver?.Dispose();
                 GamepadDriver?.Dispose();
                 MouseDriver?.Dispose();
-                Handheld?.Dispose();
             }
         }
 

src/Ryujinx.Input/HLE/NpadController.cs

@@ -218,14 +218,12 @@ namespace Ryujinx.Input.HLE
         public string Id { get; private set; }
 
         private readonly CemuHookClient _cemuHookClient;
-        private readonly IHandheld _handheld;
 
-        public NpadController(CemuHookClient cemuHookClient, IHandheld handheld)
+        public NpadController(CemuHookClient cemuHookClient)
         {
             State = default;
             Id = null;
             _cemuHookClient = cemuHookClient;
-            _handheld = handheld;
         }
 
         public bool UpdateDriverConfiguration(IGamepadDriver gamepadDriver, InputConfig config)
@@ -289,18 +287,6 @@ namespace Ryujinx.Input.HLE
 
                 if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                 {
-                    if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.Handheld)
-                    {
-                        Vector3 accelerometer = _handheld.GetMotionData(MotionInputId.Accelerometer);
-                        Vector3 gyroscope = _handheld.GetMotionData(MotionInputId.Gyroscope);
-
-                        accelerometer = new Vector3(accelerometer.X, -accelerometer.Z, accelerometer.Y);
-                        gyroscope = new Vector3(gyroscope.X, -gyroscope.Z, gyroscope.Y);
-
-                        _leftMotionInput.Update(accelerometer, gyroscope, (ulong)PerformanceCounter.ElapsedNanoseconds / 1000, controllerConfig.Motion.Sensitivity, (float)controllerConfig.Motion.GyroDeadzone);
-                        _rightMotionInput = _leftMotionInput;
-                    }
-
                     if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
                     {
                         if (gamepad.Features.HasFlag(GamepadFeaturesFlag.Motion))

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -31,7 +31,6 @@ namespace Ryujinx.Input.HLE
         private readonly IGamepadDriver _keyboardDriver;
         private readonly IGamepadDriver _gamepadDriver;
         private readonly IGamepadDriver _mouseDriver;
-        private readonly IHandheld _handheld;
         private bool _isDisposed;
 
         private List<InputConfig> _inputConfig;
@@ -39,7 +38,7 @@ namespace Ryujinx.Input.HLE
         private bool _enableMouse;
         private Switch _device;
 
-        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver, IHandheld handheld)
+        public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver)
         {
             _controllers = new NpadController[MaxControllers];
             _cemuHookClient = new CemuHookClient(this);
@@ -48,7 +47,6 @@ namespace Ryujinx.Input.HLE
             _gamepadDriver = gamepadDriver;
             _mouseDriver = mouseDriver;
             _inputConfig = [];
-            _handheld = handheld;
 
             _gamepadDriver.OnGamepadConnected += HandleOnGamepadConnected;
             _gamepadDriver.OnGamepadDisconnected += HandleOnGamepadDisconnected;
@@ -141,7 +139,7 @@ namespace Ryujinx.Input.HLE
                     }
                     else
                     {
-                        controller = new(_cemuHookClient, _handheld);
+                        controller = new(_cemuHookClient);
                     }
 
                     bool isValid = DriverConfigurationUpdate(ref controller, inputConfigEntry);

src/Ryujinx.Input/IHandheld.cs

@@ -1,10 +0,0 @@
-using System;
-using System.Numerics;
-
-namespace Ryujinx.Input
-{
-    public interface IHandheld : IDisposable
-    {
-        Vector3 GetMotionData(MotionInputId gyroscope);
-    }
-}

src/Ryujinx/Assets/locales.json

@@ -7522,31 +7522,6 @@
         "zh_TW": "使用與 CemuHook 相容的體感"
       }
     },
-    {
-      "ID": "ControllerSettingsMotionUseHandheldCompatibleMotion",
-      "Translations": {
-        "ar_SA": "استخدام الحركة المتوافقة مع Hendheld",
-        "de_DE": "Hendheld kompatible Bewegungssteuerung",
-        "el_GR": "Κίνηση συμβατή με Hendheld",
-        "en_US": "Use Hendheld compatible motion",
-        "es_ES": "Usar movimiento compatible con Hendheld",
-        "fr_FR": "Utiliser un capteur de mouvements Hendheld",
-        "he_IL": "השתמש בתנועת Hendheld תואמת ",
-        "it_IT": "Usa sensore compatibile con Hendheld",
-        "ja_JP": "Hendheld 互換モーションを使用",
-        "ko_KR": "Hendheld 호환 모션 사용",
-        "no_NO": "Bruk Hendheld kompatibel bevegelse",
-        "pl_PL": "Użyj ruchu zgodnego z Hendheld",
-        "pt_BR": "Usar sensor compatível com Hendheld",
-        "ru_RU": "Включить совместимость с Hendheld",
-        "sv_SE": "Använd Hendheld-kompatibel rörelse",
-        "th_TH": "ใช้การเคลื่อนไหวที่เข้ากันได้กับ Hendheld",
-        "tr_TR": "Hendheld uyumlu hareket kullan",
-        "uk_UA": "Використовувати рух, сумісний з Hendheld",
-        "zh_CN": "使用 Hendheld 兼容的体感协议",
-        "zh_TW": "使用與 Hendheld 相容的體感"
-      }
-    },
     {
       "ID": "ControllerSettingsMotionControllerSlot",
       "Translations": {
@@ -23198,4 +23173,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -23,7 +23,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
-using Ryujinx.Input.SDL3;
 using Ryujinx.SDL2.Common;
 using System;
 using System.Collections.Generic;
@@ -183,7 +182,7 @@ namespace Ryujinx.Headless
             _accountManager = new AccountManager(_libHacHorizonManager.RyujinxClient, option.UserProfile);
             _userChannelPersistence = new UserChannelPersistence();
 
-            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver(), new SDL3MotionDriver());
+            _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver());
 
             GraphicsConfig.EnableShaderCache = !option.DisableShaderCache;
 

src/Ryujinx/Program.cs

@@ -206,6 +206,16 @@ namespace Ryujinx.Ava
                     _ => ConfigurationState.Instance.Graphics.GraphicsBackend
                 };
 
+            // Check if backend threading was overridden
+            if (CommandLineState.OverrideBackendThreading is not null)
+                ConfigurationState.Instance.Graphics.BackendThreading.Value = CommandLineState.OverrideBackendThreading.ToLower() switch
+                {
+                    "auto" => BackendThreading.Auto,
+                    "off" => BackendThreading.Off,
+                    "on" => BackendThreading.On,
+                    _ => ConfigurationState.Instance.Graphics.BackendThreading
+                };
+
             // Check if docked mode was overriden.
             if (CommandLineState.OverrideDockedMode.HasValue)
                 ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;

src/Ryujinx/Ryujinx.csproj

@@ -76,7 +76,6 @@
     <ProjectReference Include="..\Ryujinx.Graphics.Metal\Ryujinx.Graphics.Metal.csproj" />
     <ProjectReference Include="..\Ryujinx.Input\Ryujinx.Input.csproj" />
     <ProjectReference Include="..\Ryujinx.Input.SDL2\Ryujinx.Input.SDL2.csproj" />
-    <ProjectReference Include="..\Ryujinx.Input.SDL3\Ryujinx.Input.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.OpenAL\Ryujinx.Audio.Backends.OpenAL.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SoundIo\Ryujinx.Audio.Backends.SoundIo.csproj" />
     <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />

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

@@ -128,7 +128,11 @@ namespace Ryujinx.Ava.UI.Controls
         public async void OpenModManager_Click(object sender, RoutedEventArgs args)
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
-                await ModManagerWindow.Show(viewModel.SelectedApplication.Id, viewModel.SelectedApplication.Name);
+                await ModManagerWindow.Show(
+                    viewModel.SelectedApplication.Id, 
+                    viewModel.SelectedApplication.IdBase, 
+                    viewModel.ApplicationLibrary, 
+                    viewModel.SelectedApplication.Name);
         }
 
         public async void PurgePtcCache_Click(object sender, RoutedEventArgs args)

src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs

@@ -10,7 +10,6 @@ namespace Ryujinx.Ava.UI.Models.Input
     public class GamepadInputConfig : BaseModel
     {
         public bool EnableCemuHookMotion { get; set; }
-        public bool EnableHandheldMotion { get; set; }
         public string DsuServerHost { get; set; }
         public int DsuServerPort { get; set; }
         public int Slot { get; set; }
@@ -519,7 +518,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     EnableMotion = controllerInput.Motion.EnableMotion;
                     GyroDeadzone = controllerInput.Motion.GyroDeadzone;
                     Sensitivity = controllerInput.Motion.Sensitivity;
-                    EnableHandheldMotion = controllerInput.Motion.MotionBackend == MotionInputBackendType.Handheld;
+
                     if (controllerInput.Motion is CemuHookMotionConfigController cemuHook)
                     {
                         EnableCemuHookMotion = true;
@@ -642,7 +641,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                 config.Motion = new StandardMotionConfigController
                 {
                     EnableMotion = EnableMotion,
-                    MotionBackend = EnableHandheldMotion ? MotionInputBackendType.Handheld : MotionInputBackendType.GamepadDriver,
+                    MotionBackend = MotionInputBackendType.GamepadDriver,
                     GyroDeadzone = GyroDeadzone,
                     Sensitivity = Sensitivity,
                 };

src/Ryujinx/UI/Models/ModModel.cs

@@ -1,5 +1,5 @@
 using Ryujinx.Ava.UI.ViewModels;
-using System.IO;
+using System.Globalization;
 
 namespace Ryujinx.Ava.UI.Models
 {
@@ -21,6 +21,11 @@ namespace Ryujinx.Ava.UI.Models
         public string Path { get; }
         public string Name { get; }
 
+        public string FormattedName => 
+            InSd && ulong.TryParse(Name, NumberStyles.HexNumber, null, out ulong applicationId)
+                ? $"Atmosphère: {System.IO.Path.GetFileNameWithoutExtension(RyujinxApp.MainWindow.ApplicationLibrary.GetNameForApplicationId(applicationId))}"
+                : Name;
+
         public ModModel(string path, string name, bool enabled, bool inSd)
         {
             Path = path;

src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs

@@ -18,34 +18,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         [ObservableProperty] private double _gyroDeadzone;
 
-        private bool _enableCemuHookMotion;
-        public bool EnableCemuHookMotion
-        {
-            get => _enableCemuHookMotion;
-            set
-            {
-                if (value)
-                {
-                    EnableHandheldMotion = false;
-                }
-                _enableCemuHookMotion = value;
-                OnPropertyChanged();
-            }
-        }
-
-        private bool _enableHandheldMotion;
-        public bool EnableHandheldMotion
-        {
-            get => _enableHandheldMotion;
-            set
-            {
-                if (value)
-                {
-                    EnableCemuHookMotion = false;
-                }
-                _enableHandheldMotion = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private bool _enableCemuHookMotion;
     }
 }

src/Ryujinx/UI/ViewModels/ModManagerViewModel.cs

@@ -7,6 +7,7 @@ using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
@@ -29,6 +30,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private string _search;
         private readonly ulong _applicationId;
+        private readonly ulong[] _installedDlcIds;
         private readonly IStorageProvider _storageProvider;
 
         private static readonly ModMetadataJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -61,18 +63,23 @@ namespace Ryujinx.Ava.UI.ViewModels
             get => string.Format(LocaleManager.Instance[LocaleKeys.ModWindowHeading], Mods.Count);
         }
 
-        public ModManagerViewModel(ulong applicationId)
+        public ModManagerViewModel(ulong applicationId, ulong applicationIdBase, ApplicationLibrary appLibrary)
         {
             _applicationId = applicationId;
 
+            _installedDlcIds = appLibrary.DownloadableContents.Keys
+                .Where(x => x.TitleIdBase == applicationIdBase)
+                .Select(x => x.TitleId)
+                .ToArray();
+
             _modJsonPath = Path.Combine(AppDataManager.GamesDirPath, applicationId.ToString("x16"), "mods.json");
 
             _storageProvider = RyujinxApp.MainWindow.StorageProvider;
 
-            LoadMods(applicationId);
+            LoadMods(applicationId, _installedDlcIds);
         }
 
-        private void LoadMods(ulong applicationId)
+        private void LoadMods(ulong applicationId, ulong[] installedDlcIds)
         {
             Mods.Clear();
             SelectedMods.Clear();
@@ -84,7 +91,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 bool inSd = path == ModLoader.GetSdModsBasePath();
                 ModLoader.ModCache modCache = new();
 
-                ModLoader.QueryContentsDir(modCache, new DirectoryInfo(Path.Combine(path, "contents")), applicationId);
+                ModLoader.QueryContentsDir(modCache, new DirectoryInfo(Path.Combine(path, "contents")), applicationId, _installedDlcIds);
 
                 foreach (ModLoader.Mod<DirectoryInfo> mod in modCache.RomfsDirs)
                 {
@@ -278,7 +285,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 File.Copy(file, file.Replace(directory.Parent.ToString(), destinationDir), true);
             }
 
-            LoadMods(_applicationId);
+            LoadMods(_applicationId, _installedDlcIds);
         }
 
         public async void Add()

src/Ryujinx/UI/Views/Input/MotionInputView.axaml

@@ -61,17 +61,6 @@
                     Margin="5, 0"
                     Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
             </StackPanel>
-            <Separator
-                Height="1"
-                Margin="0,5" />
-            <CheckBox
-                Margin="5"
-                IsChecked="{Binding EnableHandheldMotion}">
-                <TextBlock
-                    Margin="0,3,0,0"
-                    VerticalAlignment="Center"
-                    Text="{ext:Locale ControllerSettingsMotionUseHandheldCompatibleMotion}" />
-            </CheckBox>
             <Separator
                 Height="1"
                 Margin="0,5" />

src/Ryujinx/UI/Views/Input/MotionInputView.axaml.cs

@@ -30,7 +30,6 @@ namespace Ryujinx.Ava.UI.Views.Input
                 Sensitivity = config.Sensitivity,
                 GyroDeadzone = config.GyroDeadzone,
                 EnableCemuHookMotion = config.EnableCemuHookMotion,
-                EnableHandheldMotion = config.EnableHandheldMotion,
             };
 
             InitializeComponent();
@@ -59,7 +58,6 @@ namespace Ryujinx.Ava.UI.Views.Input
                 config.DsuServerHost = content._viewModel.DsuServerHost;
                 config.DsuServerPort = content._viewModel.DsuServerPort;
                 config.EnableCemuHookMotion = content._viewModel.EnableCemuHookMotion;
-                config.EnableHandheldMotion = content._viewModel.EnableHandheldMotion;
                 config.MirrorInput = content._viewModel.MirrorInput;
             };
 

src/Ryujinx/UI/Windows/CheatWindow.axaml.cs

@@ -64,7 +64,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             ModLoader.ModCache mods = new();
 
-            ModLoader.QueryContentsDir(mods, new DirectoryInfo(Path.Combine(modsBasePath, "contents")), titleIdValue);
+            ModLoader.QueryContentsDir(mods, new DirectoryInfo(Path.Combine(modsBasePath, "contents")), titleIdValue, []);
 
             string currentCheatFile = string.Empty;
             string buildId = string.Empty;

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -29,11 +29,11 @@ using Ryujinx.HLE.HOS;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.Input.HLE;
 using Ryujinx.Input.SDL2;
-using Ryujinx.Input.SDL3;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             if (Program.PreviewerDetached)
             {
-                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver(), new SDL3MotionDriver());
+                InputManager = new InputManager(new AvaloniaKeyboardDriver(this), new SDL2GamepadDriver());
 
                 _ = this.GetObservable(IsActiveProperty).Subscribe(it => ViewModel.IsActive = it);
                 this.ScalingChanged += OnScalingChanged;

src/Ryujinx/UI/Windows/ModManagerWindow.axaml

@@ -81,7 +81,7 @@
                                     MaxLines="2"
                                     TextWrapping="Wrap"
                                     TextTrimming="CharacterEllipsis"
-                                    Text="{Binding Name}" />
+                                    Text="{Binding FormattedName}" />
                                 <StackPanel
                                     Grid.Column="1"
                                     Spacing="10"

src/Ryujinx/UI/Windows/ModManagerWindow.axaml.cs

@@ -6,6 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Helper;
 using System.Threading.Tasks;
 using Button = Avalonia.Controls.Button;
@@ -23,21 +24,21 @@ namespace Ryujinx.Ava.UI.Windows
             InitializeComponent();
         }
 
-        public ModManagerWindow(ulong titleId)
+        public ModManagerWindow(ulong titleId, ulong titleIdBase, ApplicationLibrary applicationLibrary)
         {
-            DataContext = ViewModel = new ModManagerViewModel(titleId);
+            DataContext = ViewModel = new ModManagerViewModel(titleId, titleIdBase, applicationLibrary);
 
             InitializeComponent();
         }
 
-        public static async Task Show(ulong titleId, string titleName)
+        public static async Task Show(ulong titleId, ulong titleIdBase, ApplicationLibrary appLibrary, string titleName)
         {
             ContentDialog contentDialog = new()
             {
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new ModManagerWindow(titleId),
+                Content = new ModManagerWindow(titleId, titleIdBase, appLibrary),
                 Title = string.Format(LocaleManager.Instance[LocaleKeys.ModWindowTitle], titleName, titleId.ToString("X16")),
             };
 

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -111,6 +111,30 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             return data;
         }
 
+        /// <summary>
+        ///     Gets a name for an available content file based on the Application ID '<paramref name="id"/>'.
+        ///     <br/><br/>
+        ///     For Applications, this returns the localized name of the app found in the file.
+        ///     For DLCs, this returns the name of the file that contains the DLC, minus the file extension.
+        /// </summary>
+        /// <param name="id">The Application ID to search for.</param>
+        /// <remarks>
+        /// If the provided Application ID does not have a corresponding Application OR DLC file,
+        /// <paramref name="id"/> formatted as hexadecimal is returned.
+        /// </remarks>
+        /// <returns>A formatted Application name, or <paramref name="id"/> as hexadecimal if none is found.</returns>
+        public string GetNameForApplicationId(ulong id)
+        {
+            DynamicData.Kernel.Optional<ApplicationData> appData = Applications.Lookup(id);
+            if (appData.HasValue)
+                return appData.Value.Name;
+            
+            if (DownloadableContents.Keys.FindFirst(x => x.TitleId == id).TryGet(out DownloadableContentModel dlcData))
+                return dlcData.FileName;
+
+            return id.ToString("X16");
+        }
+
         /// <exception cref="LibHac.Common.Keys.MissingKeyException">The configured key set is missing a key.</exception>
         /// <exception cref="InvalidDataException">The NCA header could not be decrypted.</exception>
         /// <exception cref="NotSupportedException">The NCA version is not supported.</exception>

src/Ryujinx/Utilities/CommandLineState.cs

@@ -10,6 +10,7 @@ namespace Ryujinx.Ava.Utilities
         public static bool? OverrideDockedMode { get; private set; }
         public static bool? OverrideHardwareAcceleration { get; private set; }
         public static string OverrideGraphicsBackend { get; private set; }
+        public static string OverrideBackendThreading { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
         public static string Profile { get; private set; }
@@ -74,6 +75,16 @@ namespace Ryujinx.Ava.Utilities
 
                         OverrideGraphicsBackend = args[++i];
                         break;
+                    case "--backend-threading":
+                        if (i + 1 >= args.Length)
+                        {
+                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
+
+                            continue;
+                        }
+
+                        OverrideBackendThreading = args[++i];
+                        break;
                     case "-i":
                     case "--application-id":
                         LaunchApplicationId = args[++i];