Start building more accurate vertex as compute usage info

- Fixes

Directory.Packages.props

@@ -3,25 +3,25 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="12.1.2" />
+    <PackageVersion Include="Avalonia" Version="12.1.1" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.1.2" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
     <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="12.1.2" />
-    <PackageVersion Include="Svg.Controls.Avalonia" Version="12.0.0.17" />
-    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.17" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="12.1.1" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="12.0.0.13" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.13" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
     <PackageVersion Include="DynamicData" Version="9.4.33" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="3.1.0" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="3.0.2" />
     <PackageVersion Include="Gommon" Version="2.8.1.2" />
     <PackageVersion Include="Humanizer" Version="3.0.10" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.22.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.21.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
     <PackageVersion Include="NetCoreServer" Version="8.0.7" />
@@ -36,7 +36,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Linux" Version="6.1.4-build6" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.macOS" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Windows" Version="6.1.4-build6" />
-    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.3-ryujinx.1" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.2-ryujinx.6" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
     <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.707.0" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
@@ -48,7 +48,7 @@
     <PackageVersion Include="SkiaSharp" Version="3.119.4" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="10.0.12" />
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.10" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
   </ItemGroup>
-</Project>
+</Project>

Ryujinx.slnx

@@ -21,7 +21,6 @@
   <Project Path="src/Ryujinx.Graphics.Nvdec.Vp9/Ryujinx.Graphics.Nvdec.Vp9.csproj" />
   <Project Path="src/Ryujinx.Graphics.Nvdec/Ryujinx.Graphics.Nvdec.csproj" />
   <Project Path="src/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj" />
-  <Project Path="src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj" />
   <Project Path="src/Ryujinx.Graphics.Shader/Ryujinx.Graphics.Shader.csproj" />
   <Project Path="src/Ryujinx.Graphics.Texture/Ryujinx.Graphics.Texture.csproj" />
   <Project Path="src/Ryujinx.Graphics.Vic/Ryujinx.Graphics.Vic.csproj" />

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -32,11 +32,14 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 7031; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7020; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";
 
+        private const string TitleIdTextDefault = "0000000000000000";
+        private const string DisplayVersionDefault = "0";
+
         public static readonly Symbol PageTableSymbol = new(SymbolType.Special, 1);
         public static readonly Symbol CountTableSymbol = new(SymbolType.Special, 2);
         public static readonly Symbol DispatchStubSymbol = new(SymbolType.Special, 3);
@@ -64,7 +67,8 @@ namespace ARMeilleure.Translation.PTC
 
         private bool _disposed;
 
-        public PtcCacheInfo CacheInfo { get; private set; }
+        public string TitleIdText { get; private set; }
+        public string DisplayVersion { get; private set; }
 
         private MemoryManagerType _memoryMode;
 
@@ -93,7 +97,8 @@ namespace ARMeilleure.Translation.PTC
 
             _disposed = false;
 
-            CacheInfo = new PtcCacheInfo(0, null, null, 0, null, "Unknown", "default");
+            TitleIdText = TitleIdTextDefault;
+            DisplayVersion = DisplayVersionDefault;
 
             CachePathActual = string.Empty;
             CachePathBackup = string.Empty;
@@ -101,24 +106,20 @@ namespace ARMeilleure.Translation.PTC
             Disable();
         }
 
-        public void Initialize(PtcCacheInfo cacheInfo, bool enabled, MemoryManagerType memoryMode)
+        public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode, string cacheSelector)
         {
             Wait();
 
             Profiler.Wait();
             Profiler.ClearEntries();
 
-            CacheInfo = cacheInfo;
+            Logger.Info?.Print(LogClass.Ptc, $"Initializing Profiled Persistent Translation Cache v{InternalVersion}\n\t\t (title: {titleIdText}, version: '{displayVersion}', selector: '{cacheSelector}', enabled: {enabled}).");
 
-            Logger.Info?.Print(
-                LogClass.Ptc,
-                $"Initializing Profiled Persistent Translation Cache v{InternalVersion}\n\t\t " +
-                $"(pid: {cacheInfo.ProcessId}, title: {cacheInfo.TitleIdText}, application: {cacheInfo.ApplicationIdText}, " +
-                $"programIndex: {cacheInfo.ProgramIndex}, version: '{cacheInfo.DisplayVersion}', kind: {cacheInfo.ProcessKind}, " +
-                $"selector: '{cacheInfo.CacheSelector}', key: '{cacheInfo.CacheKey}', enabled: {enabled}).");
-
-            if (!enabled || cacheInfo.TitleIdText == PtcCacheInfo.TitleIdTextDefault)
+            if (!enabled || string.IsNullOrEmpty(titleIdText) || titleIdText == TitleIdTextDefault)
             {
+                TitleIdText = TitleIdTextDefault;
+                DisplayVersion = DisplayVersionDefault;
+
                 CachePathActual = string.Empty;
                 CachePathBackup = string.Empty;
 
@@ -127,10 +128,12 @@ namespace ARMeilleure.Translation.PTC
                 return;
             }
 
+            TitleIdText = titleIdText;
+            DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
             _memoryMode = memoryMode;
 
-            string workPathActual = Path.Combine(AppDataManager.GamesDirPath, CacheInfo.TitleIdText, "cache", "cpu", ActualDir);
-            string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, CacheInfo.TitleIdText, "cache", "cpu", BackupDir);
+            string workPathActual = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", ActualDir);
+            string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", BackupDir);
 
             if (!Directory.Exists(workPathActual))
             {
@@ -142,14 +145,8 @@ namespace ARMeilleure.Translation.PTC
                 Directory.CreateDirectory(workPathBackup);
             }
 
-            CachePathActual = Path.Combine(workPathActual, CacheInfo.DisplayVersion) + "-" + CacheInfo.CacheSelector;
-            CachePathBackup = Path.Combine(workPathBackup, CacheInfo.DisplayVersion) + "-" + CacheInfo.CacheSelector;
-
-            Logger.Info?.Print(
-                LogClass.Ptc,
-                $"PPTC cache owner selected (pid: {CacheInfo.ProcessId}, title: {CacheInfo.TitleIdText}, application: {CacheInfo.ApplicationIdText}, " +
-                $"version: '{CacheInfo.DisplayVersion}', kind: {CacheInfo.ProcessKind}, selector: '{CacheInfo.CacheSelector}', " +
-                $"key: '{CacheInfo.CacheKey}', path: '{CachePathActual}').");
+            CachePathActual = Path.Combine(workPathActual, DisplayVersion) + "-" + cacheSelector;
+            CachePathBackup = Path.Combine(workPathBackup, DisplayVersion) + "-" + cacheSelector;
 
             PreLoad();
             Profiler.PreLoad();
@@ -373,12 +370,7 @@ namespace ARMeilleure.Translation.PTC
 
             long fileSize = new FileInfo(fileName).Length;
 
-            Logger.Info?.Print(
-                LogClass.Ptc,
-                $"{(isBackup ? "Loaded Backup Translation Cache" : "Loaded Translation Cache")} " +
-                $"(pid: {CacheInfo.ProcessId}, title: {CacheInfo.TitleIdText}, version: '{CacheInfo.DisplayVersion}', kind: {CacheInfo.ProcessKind}, " +
-                $"selector: '{CacheInfo.CacheSelector}', key: '{CacheInfo.CacheKey}', path: '{fileName}', " +
-                $"size: {fileSize} bytes, translated functions: {GetEntriesCount()}).");
+            Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Translation Cache" : "Loaded Translation Cache")} (size: {fileSize} bytes, translated functions: {GetEntriesCount()}).");
 
             return true;
         }

src/ARMeilleure/Translation/PTC/PtcCacheInfo.cs

@@ -1,37 +0,0 @@
-namespace ARMeilleure.Translation.PTC
-{
-    public readonly struct PtcCacheInfo
-    {
-        public const string TitleIdTextDefault = "0000000000000000";
-        public const string ApplicationIdTextDefault = "0000000000000000";
-        public const string DisplayVersionDefault = "0";
-
-        public ulong ProcessId { get; }
-        public string TitleIdText { get; }
-        public string ApplicationIdText { get; }
-        public byte ProgramIndex { get; }
-        public string DisplayVersion { get; }
-        public string ProcessKind { get; }
-        public string CacheSelector { get; }
-
-        public string CacheKey => $"{DisplayVersion}-{CacheSelector}";
-
-        public PtcCacheInfo(
-            ulong processId,
-            string titleIdText,
-            string applicationIdText,
-            byte programIndex,
-            string displayVersion,
-            string processKind,
-            string cacheSelector)
-        {
-            ProcessId = processId;
-            TitleIdText = !string.IsNullOrEmpty(titleIdText) ? titleIdText : TitleIdTextDefault;
-            ApplicationIdText = !string.IsNullOrEmpty(applicationIdText) ? applicationIdText : ApplicationIdTextDefault;
-            ProgramIndex = programIndex;
-            DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
-            ProcessKind = processKind ?? string.Empty;
-            CacheSelector = string.IsNullOrEmpty(cacheSelector) ? "default" : cacheSelector;
-        }
-    }
-}

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -23,7 +23,7 @@ namespace ARMeilleure.Translation.PTC
     {
         private const string OuterHeaderMagicString = "Pohd\0\0\0\0";
 
-        private const uint InternalVersion = 7031; //! Not to be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 6698; //! Not to be incremented manually for each change to the ARMeilleure project.
 
         private static readonly uint[] _migrateInternalVersions = 
         [
@@ -254,12 +254,7 @@ namespace ARMeilleure.Translation.PTC
 
             long fileSize = new FileInfo(fileName).Length;
 
-            Logger.Info?.Print(
-                LogClass.Ptc,
-                $"{(isBackup ? "Loaded Backup Profiling Info" : "Loaded Profiling Info")} " +
-                $"(pid: {_ptc.CacheInfo.ProcessId}, title: {_ptc.CacheInfo.TitleIdText}, version: '{_ptc.CacheInfo.DisplayVersion}', " +
-                $"kind: {_ptc.CacheInfo.ProcessKind}, selector: '{_ptc.CacheInfo.CacheSelector}', key: '{_ptc.CacheInfo.CacheKey}', " +
-                $"path: '{fileName}', size: {fileSize} bytes, profiled functions: {ProfiledFuncs.Count}).");
+            Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Profiling Info" : "Loaded Profiling Info")} (size: {fileSize} bytes, profiled functions: {ProfiledFuncs.Count}).");
 
             return true;
         }
@@ -380,11 +375,7 @@ namespace ARMeilleure.Translation.PTC
 
             if (fileSize != 0L)
             {
-                Logger.Info?.Print(
-                    LogClass.Ptc,
-                    $"Saved Profiling Info (pid: {_ptc.CacheInfo.ProcessId}, title: {_ptc.CacheInfo.TitleIdText}, version: '{_ptc.CacheInfo.DisplayVersion}', " +
-                    $"kind: {_ptc.CacheInfo.ProcessKind}, selector: '{_ptc.CacheInfo.CacheSelector}', key: '{_ptc.CacheInfo.CacheKey}', " +
-                    $"path: '{fileName}', size: {fileSize} bytes, profiled functions: {profiledFuncsCount}).");
+                Logger.Info?.Print(LogClass.Ptc, $"Saved Profiling Info (size: {fileSize} bytes, profiled functions: {profiledFuncsCount}).");
             }
         }
 

src/ARMeilleure/Translation/Translator.cs

@@ -61,9 +61,9 @@ namespace ARMeilleure.Translation
             FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
         }
 
-        public IPtcLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
+        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
         {
-            _ptc.Initialize(cacheInfo, enabled, Memory.Type);
+            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type, cacheSelector);
             return _ptc;
         }
 

src/Ryujinx.Common/Configuration/Hid/Controller/RumbleConfigController.cs

@@ -16,10 +16,5 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
         /// Enable Rumble
         /// </summary>
         public bool EnableRumble { get; set; }
-        
-        /// <summary>
-        /// Enable HD Rumble support
-        /// </summary
-        public bool UseHDRumble { get; set; }
     }
 }

src/Ryujinx.Common/Utilities/EmbeddedResources.cs

@@ -126,13 +126,8 @@ namespace Ryujinx.Common
 
         public static string[] GetAllAvailableResources(string path, string ext = "")
         {
-            (Assembly assembly, string resourcePath) = ResolveManifestPath(path);
-
-            string manifestPath = assembly.GetName().Name + "." + resourcePath.Replace('/', '.');
-
-            return assembly.GetManifestResourceNames()
-                .Where(r => r.StartsWith(manifestPath + ".", StringComparison.Ordinal))
-                .Where(r => r.EndsWith(ext, StringComparison.Ordinal))
+            return ResolveManifestPath(path).Item1.GetManifestResourceNames()
+                .Where(r => r.EndsWith(ext))
                 .ToArray();
         }
 

src/Ryujinx.Cpu/AppleHv/HvCpuContext.cs

@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using ARMeilleure.Translation.PTC;
 using System.Runtime.Versioning;
 
 namespace Ryujinx.Cpu.AppleHv
@@ -33,7 +32,7 @@ namespace Ryujinx.Cpu.AppleHv
         {
         }
 
-        public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
+        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
         {
             return new DummyDiskCacheLoadState();
         }

src/Ryujinx.Cpu/ICpuContext.cs

@@ -1,5 +1,4 @@
 using System;
-using ARMeilleure.Translation.PTC;
 
 namespace Ryujinx.Cpu
 {
@@ -45,10 +44,11 @@ namespace Ryujinx.Cpu
         /// <remarks>
         /// If the execution engine is recompiling guest code, this can be used to load cached code from disk.
         /// </remarks>
-        /// <param name="cacheInfo">Identity and selector for the process-owned disk cache</param>
+        /// <param name="titleIdText">Title ID of the application in padded hex form</param>
+        /// <param name="displayVersion">Version of the application</param>
         /// <param name="enabled">True if the cache should be loaded from disk if it exists, false otherwise</param>
         /// <returns>Disk cache load progress reporter and manager</returns>
-        IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled);
+        IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector);
 
         /// <summary>
         /// Indicates that code has been loaded into guest memory, and that it might be executed in the future.

src/Ryujinx.Cpu/Jit/JitCpuContext.cs

@@ -1,7 +1,6 @@
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.Translation;
-using ARMeilleure.Translation.PTC;
 using Ryujinx.Cpu.Signal;
 
 namespace Ryujinx.Cpu.Jit
@@ -52,9 +51,9 @@ namespace Ryujinx.Cpu.Jit
         }
 
         /// <inheritdoc/>
-        public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
+        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
         {
-            return new JitDiskCacheLoadState(_translator.LoadDiskCache(cacheInfo, enabled));
+            return new JitDiskCacheLoadState(_translator.LoadDiskCache(titleIdText, displayVersion, enabled, cacheSelector));
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/LightningJit/LightningJitCpuContext.cs

@@ -1,6 +1,5 @@
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
-using ARMeilleure.Translation.PTC;
 using Ryujinx.Cpu.Jit;
 using Ryujinx.Cpu.LightningJit.State;
 
@@ -47,7 +46,7 @@ namespace Ryujinx.Cpu.LightningJit
         }
 
         /// <inheritdoc/>
-        public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
+        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
         {
             return new DummyDiskCacheLoadState();
         }

src/Ryujinx.Graphics.GAL/Target.cs

@@ -16,18 +16,19 @@ namespace Ryujinx.Graphics.GAL
 
     public static class TargetExtensions
     {
-        extension(Target target)
+        public static bool IsMultisample(this Target target)
         {
-            public bool IsMultisample => target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray;
+            return target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray;
+        }
 
-            public bool HasDepthOrLayers =>
-                target is 
-                    Target.Texture3D or
-                    Target.Texture1DArray or
-                    Target.Texture2DArray or
-                    Target.Texture2DMultisampleArray or
-                    Target.Cubemap or
-                    Target.CubemapArray;
+        public static bool HasDepthOrLayers(this Target target)
+        {
+            return target is Target.Texture3D
+                or Target.Texture1DArray
+                or Target.Texture2DArray
+                or Target.Texture2DMultisampleArray
+                or Target.Cubemap
+                or Target.CubemapArray;
         }
     }
 }

src/Ryujinx.Graphics.Gpu/Image/Texture.cs

@@ -1117,7 +1117,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <returns>True if data was flushed, false otherwise</returns>
         public bool FlushModified(bool tracked = true)
         {
-            return TextureCompatibility.CanTextureFlush(Info, _context.Capabilities) && Group.FlushModified(this, tracked);
+            return TextureCompatibility.CanTextureFlush(this, _context.Capabilities) && Group.FlushModified(this, tracked);
         }
 
         /// <summary>
@@ -1131,7 +1131,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="tracked">Whether or not the flush triggers write tracking. If it doesn't, the texture will not be blacklisted for scaling either.</param>
         public void Flush(bool tracked)
         {
-            if (TextureCompatibility.CanTextureFlush(Info, _context.Capabilities))
+            if (TextureCompatibility.CanTextureFlush(this, _context.Capabilities))
             {
                 FlushTextureDataToGuest(tracked);
             }
@@ -1336,7 +1336,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             {
                 result = TextureCompatibility.PropagateViewCompatibility(result, TextureCompatibility.ViewTargetCompatible(Info, info, ref caps));
 
-                bool bothMs = Info.Target.IsMultisample && info.Target.IsMultisample;
+                bool bothMs = Info.Target.IsMultisample() && info.Target.IsMultisample();
                 if (bothMs && (Info.SamplesInX != info.SamplesInX || Info.SamplesInY != info.SamplesInY))
                 {
                     result = TextureViewCompatibility.Incompatible;

src/Ryujinx.Graphics.Gpu/Image/TextureCompatibility.cs

@@ -195,6 +195,16 @@ namespace Ryujinx.Graphics.Gpu.Image
             return true;
         }
 
+        /// <summary>
+        /// Determines whether a texture can flush its data back to guest memory.
+        /// </summary>
+        /// <param name="info">Texture that will have its data flushed</param>
+        /// <param name="caps">Host GPU Capabilities</param>
+        /// <returns>True if the texture can flush, false otherwise</returns>
+        public static bool CanTextureFlush(Texture texture, in Capabilities caps)
+        {
+            return !texture.HasImportOverride() && CanTextureFlush(texture.Info, caps);
+        }
 
         /// <summary>
         /// Determines whether a texture can flush its data back to guest memory.
@@ -202,15 +212,14 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="info">Texture information</param>
         /// <param name="caps">Host GPU Capabilities</param>
         /// <returns>True if the texture can flush, false otherwise</returns>
-       public static bool CanTextureFlush(TextureInfo info, Capabilities caps)
+        private static bool CanTextureFlush(TextureInfo info, in Capabilities caps)
         {
-            if (IsFormatHostIncompatible(info, caps))
+            if (IsFormatHostIncompatible(info, in caps))
             {
                 return false; // Flushing this format is not supported, as it may have been converted to another host format.
             }
 
-            if (info.Target is Target.Texture2DMultisample or
-                Target.Texture2DMultisampleArray)
+            if (info.Target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray)
             {
                 return false; // Flushing multisample textures is not supported, the host does not allow getting their data.
             }
@@ -372,15 +381,12 @@ namespace Ryujinx.Graphics.Gpu.Image
             }
 
             // Some APIs align the width for copy and render target textures,
-            // so the width may not match for different uses of the same texture.
+            // so the width may not match in this case for different uses of the same texture.
             // To account for this, we compare the aligned width here.
-            // However, matching block footprints are not sufficient for compressed textures;
-            // their logical dimensions must also match.
+            // We expect height to always match exactly, if the texture is the same.
             if (alignedWidthMatches && lhsSize.Height == rhsSize.Height)
             {
-                return ((lhs.FormatInfo.IsCompressed || rhs.FormatInfo.IsCompressed) &&
-                        (Math.Max(1, lhs.Width >> level) != rhs.Width || Math.Max(1, lhs.Height >> level) != rhs.Height)) ||
-                       (exact && lhsSize.Width != rhsSize.Width) || lhsSize.Width < rhsSize.Width
+                return (exact && lhsSize.Width != rhsSize.Width) || lhsSize.Width < rhsSize.Width
                     ? TextureViewCompatibility.CopyOnly
                     : result;
             }
@@ -391,7 +397,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 return stride == rhs.Stride ? TextureViewCompatibility.CopyOnly : TextureViewCompatibility.LayoutIncompatible;
             }
-            else if (lhs.Target.IsMultisample != rhs.Target.IsMultisample && alignedWidthMatches && lhsAlignedSize.Height == rhsAlignedSize.Height)
+            else if (lhs.Target.IsMultisample() != rhs.Target.IsMultisample() && alignedWidthMatches && lhsAlignedSize.Height == rhsAlignedSize.Height)
             {
                 // Copy between multisample and non-multisample textures with mismatching size is allowed,
                 // as long aligned size matches.

src/Ryujinx.Graphics.Gpu/Image/TextureGroup.cs

@@ -147,7 +147,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             _allOffsets = size.AllOffsets;
             _sliceSizes = size.SliceSizes;
 
-            if (Storage.Target.HasDepthOrLayers && Storage.Info.GetSlices() > GranularLayerThreshold)
+            if (Storage.Target.HasDepthOrLayers() && Storage.Info.GetSlices() > GranularLayerThreshold)
             {
                 _hasLayerViews = true;
                 _hasMipViews = true;
@@ -182,11 +182,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             foreach (TextureIncompatibleOverlap overlap in _incompatibleOverlaps)
             {
-                // LayoutIncompatible and better may still use a regular texture copy dependency.
-                // Fully Incompatible pairs are not copy compatible in general, but may still qualify for an
-                // exact raw byte copy dependency (checked internally by CreateCopyDependency) when they map
-                // to exactly the same guest memory, such as differently typed/sized aliases of the same data.
-                if (overlap.Compatibility <= TextureViewCompatibility.Incompatible)
+                if (overlap.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
                 {
                     CreateCopyDependency(overlap.Group, false, overlap.Compatibility);
                 }
@@ -230,6 +226,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             }
         }
 
+
         /// <summary>
         /// Flushes incompatible overlaps if the storage format requires it, and they have been modified.
         /// This allows unsupported host formats to accept data written to format aliased textures.
@@ -327,7 +324,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             FlushIncompatibleOverlapsIfNeeded();
 
-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, _) =>
             {
                 bool dirty = false;
                 bool anyModified = false;
@@ -482,7 +479,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <param name="texture">The texture to synchronize dependents of</param>
         public void SynchronizeDependents(Texture texture)
         {
-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, _, _) =>
             {
                 for (int i = 0; i < regionCount; i++)
                 {
@@ -574,7 +571,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             tracked = tracked || ShouldFlushTriggerTracking();
             bool flushed = false;
 
-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, _) =>
             {
                 int startSlice = 0;
                 int endSlice = 0;
@@ -655,14 +652,14 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             if (_flushBuffer == BufferHandle.Null)
             {
-                if (!TextureCompatibility.CanTextureFlush(Storage.Info, _context.Capabilities))
+                if (!TextureCompatibility.CanTextureFlush(Storage, _context.Capabilities))
                 {
                     return;
                 }
 
                 bool canImport = Storage.Info.IsLinear && Storage.Info.Stride >= Storage.Info.Width * Storage.Info.FormatInfo.BytesPerPixel;
 
-                nint hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
+                IntPtr hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
 
                 if (hostPointer != 0 && _context.Renderer.PrepareHostMapping(hostPointer, Storage.Size))
                 {
@@ -719,7 +716,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
             ClearIncompatibleOverlaps(texture);
 
-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, _, _) =>
             {
                 for (int i = 0; i < regionCount; i++)
                 {
@@ -1052,7 +1049,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             int endOffset = _allOffsets[viewEnd] + _sliceSizes[lastLevel];
             int size = endOffset - offset;
 
-            List<RegionHandle> result = [];
+            List<RegionHandle> result = new();
 
             for (int i = 0; i < TextureRange.Count; i++)
             {
@@ -1166,6 +1163,7 @@ namespace Ryujinx.Graphics.Gpu.Image
             SignalAllDirty();
         }
 
+
         /// <summary>
         /// Removes a view from the group, removing it from all overlap lists.
         /// </summary>
@@ -1387,7 +1385,7 @@ namespace Ryujinx.Graphics.Gpu.Image
 
                 if (_is3D)
                 {
-                    List<TextureGroupHandle> handlesList = [];
+                    List<TextureGroupHandle> handlesList = new();
 
                     for (int i = 0; i < levelHandles; i++)
                     {
@@ -1470,15 +1468,15 @@ namespace Ryujinx.Graphics.Gpu.Image
             // Get the location of each texture within its storage, so we can find the handles to apply the dependency to.
             // This can consist of multiple disjoint regions, for example if this is a mip slice of an array texture.
 
-            List<(int BaseHandle, int RegionCount)> targetRange = [];
-            List<(int BaseHandle, int RegionCount)> otherRange = [];
+            List<(int BaseHandle, int RegionCount)> targetRange = new();
+            List<(int BaseHandle, int RegionCount)> otherRange = new();
 
-            EvaluateRelevantHandles(firstLayer, firstLevel, other.Info.GetSlices(), other.Info.Levels, (baseHandle, regionCount, split, specialData) =>
+            EvaluateRelevantHandles(firstLayer, firstLevel, other.Info.GetSlices(), other.Info.Levels, (baseHandle, regionCount, _, _) =>
             {
                 targetRange.Add((baseHandle, regionCount));
                 return true;
             }, out _);
-            otherGroup.EvaluateRelevantHandles(other, (baseHandle, regionCount, split, specialData) =>
+            otherGroup.EvaluateRelevantHandles(other, (baseHandle, regionCount, _, _) =>
             {
                 otherRange.Add((baseHandle, regionCount));
                 return true;
@@ -1603,15 +1601,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                         TextureInfo info = Storage.Info;
                         TextureInfo otherInfo = other.Storage.Info;
 
-                        // ViewLayoutCompatible/CopySizeMatches only reason about textures with some genuine
-                        // format relationship (LayoutIncompatible or better) - they are not aware of, and must
-                        // never be used to justify, a plain texture-to-texture copy (which some backends
-                        // implement via a reinterpreting view) between fully Incompatible aliases such as a
-                        // depth format and an unrelated color format. For Incompatible pairs, only the strict
-                        // raw byte copy dependency below (which explicitly excludes depth/stencil formats) may
-                        // be used.
-                        bool textureCopy = compatibility != TextureViewCompatibility.Incompatible &&
-                            TextureCompatibility.ViewLayoutCompatible(info, otherInfo, level, otherLevel) &&
+                        bool textureCopy = TextureCompatibility.ViewLayoutCompatible(info, otherInfo, level, otherLevel) &&
                             TextureCompatibility.CopySizeMatches(info, otherInfo, level, otherLevel);
 
                         if (textureCopy || rawCopy)
@@ -1669,12 +1659,9 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             if (!_incompatibleOverlaps.Any(overlap => overlap.Group == other.Group))
             {
-                if (copy && other.Compatibility <= TextureViewCompatibility.Incompatible)
+                if (copy && other.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
                 {
                     // Any of the group's views may share compatibility, even if the parents do not fully.
-                    // Fully Incompatible groups are also let through here, since CreateCopyDependency will
-                    // fall back to an exact raw byte copy dependency for them when the strict requirements
-                    // for one are met (see CanCreateRawCopyDependency).
                     CreateCopyDependency(other.Group, false, other.Compatibility);
                 }
 
@@ -1776,7 +1763,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                     }
                 }
 
-                if (TextureCompatibility.CanTextureFlush(Storage.Info, _context.Capabilities) && !(inBuffer && _flushBufferImported))
+                if (TextureCompatibility.CanTextureFlush(Storage, _context.Capabilities) && !(inBuffer && _flushBufferImported))
                 {
                     FlushSliceRange(false, handle.BaseSlice, handle.BaseSlice + handle.SliceCount, inBuffer, Storage.GetFlushTexture());
                 }
@@ -1816,3 +1803,4 @@ namespace Ryujinx.Graphics.Gpu.Image
         }
     }
 }
+

src/Ryujinx.Graphics.Gpu/Image/TextureGroupHandle.cs

@@ -717,7 +717,6 @@ namespace Ryujinx.Graphics.Gpu.Image
                 }
 
                 DeferredCopy = old.DeferredCopy;
-                DeferredCopyRaw = old.DeferredCopyRaw;
             }
         }
 

src/Ryujinx.Graphics.OpenGL/Framebuffer.cs

@@ -20,27 +20,6 @@ namespace Ryujinx.Graphics.OpenGL
         private int _colorsCount;
         private bool _dualSourceBlend;
 
-        public bool HasAttachments
-        {
-            get
-            {
-                if (_depthStencil != null)
-                {
-                    return true;
-                }
-
-                for (int index = 0; index < _colors.Length; index++)
-                {
-                    if (_colors[index] != null)
-                    {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
         public Framebuffer()
         {
             Handle = GL.GenFramebuffer();
@@ -55,12 +34,6 @@ namespace Ryujinx.Graphics.OpenGL
             return Handle;
         }
 
-        public void SetDefaultSize(int width, int height)
-        {
-            GL.FramebufferParameter(FramebufferTarget.Framebuffer, FramebufferDefaultParameter.FramebufferDefaultWidth, Math.Max(1, width));
-            GL.FramebufferParameter(FramebufferTarget.Framebuffer, FramebufferDefaultParameter.FramebufferDefaultHeight, Math.Max(1, height));
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void AttachColor(int index, TextureView color)
         {
@@ -132,20 +105,13 @@ namespace Ryujinx.Graphics.OpenGL
             _colorsCount = colorsCount;
         }
 
-        private void SetDrawBuffersImpl(int colorsCount)
+        private static void SetDrawBuffersImpl(int colorsCount)
         {
             DrawBuffersEnum[] drawBuffers = new DrawBuffersEnum[colorsCount];
 
             for (int index = 0; index < colorsCount; index++)
             {
-                if (_colors[index] != null)
-                {
-                    drawBuffers[index] = DrawBuffersEnum.ColorAttachment0 + index;
-                }
-                else
-                {
-                    drawBuffers[index] = DrawBuffersEnum.None;
-                }
+                drawBuffers[index] = DrawBuffersEnum.ColorAttachment0 + index;
             }
 
             GL.DrawBuffers(colorsCount, drawBuffers);

src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs

@@ -116,8 +116,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
         {
             TextureView destinationView = (TextureView)destination;
 
-            bool srcIsMultisample = Target.IsMultisample;
-            bool dstIsMultisample = destinationView.Target.IsMultisample;
+            bool srcIsMultisample = Target.IsMultisample();
+            bool dstIsMultisample = destinationView.Target.IsMultisample();
 
             if (dstIsMultisample != srcIsMultisample && Info.Format.IsDepthOrStencil())
             {
@@ -172,8 +172,8 @@ namespace Ryujinx.Graphics.OpenGL.Image
         {
             TextureView destinationView = (TextureView)destination;
 
-            bool srcIsMultisample = Target.IsMultisample;
-            bool dstIsMultisample = destinationView.Target.IsMultisample;
+            bool srcIsMultisample = Target.IsMultisample();
+            bool dstIsMultisample = destinationView.Target.IsMultisample();
 
             if (dstIsMultisample != srcIsMultisample && Info.Format.IsDepthOrStencil())
             {
@@ -216,7 +216,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
             Extents2D srcRegion = new(0, 0, Width, Height);
             Extents2D dstRegion = new(0, 0, destinationView.Width, destinationView.Height);
 
-            if (destinationView.Target.IsMultisample)
+            if (destinationView.Target.IsMultisample())
             {
                 TextureView intermmediate = _renderer.TextureCopy.IntermediatePool.GetOrCreateWithAtLeast(
                     Info.Target,

src/Ryujinx.Graphics.OpenGL/Pipeline.cs

@@ -1537,11 +1537,6 @@ namespace Ryujinx.Graphics.OpenGL
         {
             DrawCount++;
 
-            if (!_framebuffer.HasAttachments && _viewportArray.Length >= 4)
-            {
-                _framebuffer.SetDefaultSize((int)_viewportArray[2], (int)_viewportArray[3]);
-            }
-
             _unit0Texture?.Bind(0);
         }
 

src/Ryujinx.Graphics.RenderDocApi/Capture.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    public readonly record struct Capture(int Index, string FileName, DateTime Timestamp)
-    {
-        public void SetComments(string comments)
-        {
-            RenderDoc.SetCaptureFileComments(FileName, comments);
-        }
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/CaptureOption.cs

@@ -1,100 +0,0 @@
-// ReSharper disable UnusedMember.Global
-
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    public enum CaptureOption
-    {
-        /// <summary>
-        /// specifies whether the application is allowed to enable vsync. Default is on.
-        /// </summary>
-        AllowVsync = 0,
-        /// <summary>
-        /// specifies whether the application is allowed to enter exclusive fullscreen. Default is on.
-        /// </summary>
-        AllowFullscreen = 1,
-        /// <summary>
-        /// specifies whether (where possible) API-specific debugging is enabled. Default is off.
-        /// </summary>
-        ApiValidation = 2,
-        /// <summary>
-        /// specifies whether each API call should save a callstack. Default is off.
-        /// </summary>
-        CaptureCallstacks = 3,
-        /// <summary>
-        /// specifies whether, if <see cref="CaptureCallstacks"/> is enabled, callstacks are only saved on actions. Default is off.
-        /// </summary>
-        CaptureCallstacksOnlyDraws = 4,
-        /// <summary>
-        /// specifies a delay in seconds after launching a process to pause, to allow debuggers to attach. <br/>
-        /// This will only apply to child processes since the delay happens at process startup. Default is 0.
-        /// </summary>
-        DelayForDebugger = 5,
-        /// <summary>
-        /// specifies whether any mapped memory updates should be bounds-checked for overruns,
-        /// and uninitialised buffers are initialized to <code>0xDDDDDDDD</code> to catch use of uninitialised data.
-        /// Only supported on D3D11 and OpenGL. Default is off.
-        /// </summary>
-        /// <remarks>
-        /// This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
-        /// not do the same kind of interception &amp; checking, and undefined contents are really undefined.
-        /// </remarks>
-        VerifyBufferAccess = 6,
-        /// <summary>
-        /// Hooks any system API calls that create child processes, and injects
-        /// RenderDoc into them recursively with the same options.
-        /// </summary>
-        HookIntoChildren = 7,
-        /// <summary>
-        /// specifies whether all live resources at the time of capture should be included in the capture,
-        /// even if they are not referenced by the frame. Default is off.
-        /// </summary>
-        RefAllSources = 8,
-        /// <summary>
-        /// By default, RenderDoc skips saving initial states for resources where the
-        /// previous contents don't appear to be used, assuming that writes before
-        /// reads indicate previous contents aren't used.
-        /// </summary>
-        /// <remarks>
-        /// **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
-        /// getting it will be ignored, to allow compatibility with older versions.
-        /// In v1.1 the option acts as if it's always enabled.
-        /// </remarks>
-        SaveAllInitials = 9,
-        /// <summary>
-        /// In APIs that allow for the recording of command lists to be replayed later,
-        /// RenderDoc may choose to not capture command lists before a frame capture is
-        /// triggered, to reduce overheads. This means any command lists recorded once
-        /// and replayed many times will not be available and may cause a failure to
-        /// capture.
-        /// </summary>
-        /// <remarks>
-        /// NOTE: This is only true for APIs where multithreading is difficult or
-        /// discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
-        /// and always capture all command lists since the API is heavily oriented
-        /// around it and the overheads have been reduced by API design.
-        /// </remarks>
-        CaptureAllCmdLists = 10,
-        /// <summary>
-        /// Mute API debugging output when the <see cref="ApiValidation"/> option is enabled.
-        /// </summary>
-        DebugOutputMute = 11,
-        /// <summary>
-        /// Allow vendor extensions to be used even when they may be
-        /// incompatible with RenderDoc and cause corrupted replays or crashes.
-        /// </summary>
-        AllowUnsupportedVendorExtensions = 12,
-        /// <summary>
-        /// Define a soft memory limit which some APIs may aim to keep overhead under where
-        /// possible. Anything above this limit will where possible be saved directly to disk during
-        /// capture.<br/>
-        /// This will cause increased disk space use (which may cause a capture to fail if disk space is
-        /// exhausted) as well as slower capture times.
-        /// <br/><br/>
-        /// Not all memory allocations may be deferred like this so it is not a guarantee of a memory
-        /// limit.
-        /// <br/><br/>
-        /// Units are in MBs, suggested values would range from 200MB to 1000MB.
-        /// </summary>
-        SoftMemoryLimit = 13,
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/InputButton.cs

@@ -1,83 +0,0 @@
-
-// ReSharper disable UnusedMember.Global
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    public enum InputButton
-    {
-        // '0' - '9' matches ASCII values
-        Key0 = 0x30,
-        Key1 = 0x31,
-        Key2 = 0x32,
-        Key3 = 0x33,
-        Key4 = 0x34,
-        Key5 = 0x35,
-        Key6 = 0x36,
-        Key7 = 0x37,
-        Key8 = 0x38,
-        Key9 = 0x39,
-
-        // 'A' - 'Z' matches ASCII values
-        A = 0x41,
-        B = 0x42,
-        C = 0x43,
-        D = 0x44,
-        E = 0x45,
-        F = 0x46,
-        G = 0x47,
-        H = 0x48,
-        I = 0x49,
-        J = 0x4A,
-        K = 0x4B,
-        L = 0x4C,
-        M = 0x4D,
-        N = 0x4E,
-        O = 0x4F,
-        P = 0x50,
-        Q = 0x51,
-        R = 0x52,
-        S = 0x53,
-        T = 0x54,
-        U = 0x55,
-        V = 0x56,
-        W = 0x57,
-        X = 0x58,
-        Y = 0x59,
-        Z = 0x5A,
-
-        // leave the rest of the ASCII range free
-        // in case we want to use it later
-        NonPrintable = 0x100,
-
-        Divide,
-        Multiply,
-        Subtract,
-        Plus,
-
-        F1,
-        F2,
-        F3,
-        F4,
-        F5,
-        F6,
-        F7,
-        F8,
-        F9,
-        F10,
-        F11,
-        F12,
-
-        Home,
-        End,
-        Insert,
-        Delete,
-        PageUp,
-        PageDn,
-
-        Backspace,
-        Tab,
-        PrtScrn,
-        Pause,
-
-        Max,
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/OverlayBits.cs

@@ -1,39 +0,0 @@
-// ReSharper disable UnusedMember.Global
-
-using System;
-
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    [Flags]
-    public enum OverlayBits
-    {
-        /// <summary>
-        /// This single bit controls whether the overlay is enabled or disabled globally
-        /// </summary>
-        Enabled = 1 << 0,
-        /// <summary>
-        /// Show the average framerate over several seconds as well as min/max
-        /// </summary>
-        FrameRate = 1 << 1,
-        /// <summary>
-        /// Show the current frame number
-        /// </summary>
-        FrameNumber = 1 << 2,
-        /// <summary>
-        /// Show a list of recent captures, and how many captures have been made
-        /// </summary>
-        CaptureList = 1 << 3,
-        /// <summary>
-        /// Default values for the overlay mask
-        /// </summary>
-        Default = Enabled | FrameRate | FrameNumber | CaptureList,
-        /// <summary>
-        /// Enable all bits
-        /// </summary>
-        All = ~0,
-        /// <summary>
-        /// Disable all bits
-        /// </summary>
-        None = 0
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/README.md

@@ -1,5 +0,0 @@
-# Ryujinx.Graphics.RenderDocApi
-
-This is a C# binding for RenderDoc's application API.
-This is a source-inclusion of https://github.com/utkumaden/RenderdocSharp. 
-I didn't use the NuGet package as I had a few minor changes I wanted to make, and I want to learn from it as well via hands-on experience.

src/Ryujinx.Graphics.RenderDocApi/RenderDoc.cs

@@ -1,639 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    public static unsafe partial class RenderDoc
-    {
-        /// <summary>
-        /// True if the API is available.
-        /// </summary>
-        public static bool IsAvailable => Api != null;
-
-        /// <summary>
-        /// Set the minimum version of the API you require.
-        /// </summary>
-        /// <remarks>Set this before you do anything else with the RenderDoc API, including <see cref="IsAvailable"/>.</remarks>
-        public static RenderDocVersion MinimumRequired { get; set; } = RenderDocVersion.Version_1_0_0;
-
-        /// <summary>
-        /// Set to true to assert versions.
-        /// </summary>
-        public static bool AssertVersionEnabled { get; set; } = true;
-
-        /// <summary>
-        /// Version of the API available.
-        /// </summary>
-        [MemberNotNullWhen(true, nameof(IsAvailable))]
-        public static Version? Version
-        {
-            get
-            {
-                if (!IsAvailable)
-                    return null;
-
-                int major, minor, build;
-                Api->GetApiVersion(&major, &minor, &build);
-                return new Version(major, minor, build);
-            }
-        }
-
-        /// <summary>
-        /// The current mask which determines what sections of the overlay render on each window.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static OverlayBits OverlayBits
-        {
-            get => Api->GetOverlayBits();
-            set
-            {
-                Api->MaskOverlayBits(~value, value);
-            }
-        }
-
-        /// <summary>
-        /// The template for new captures.<br/>
-        /// The template can either be a relative or absolute path, which determines where captures will be saved and how they will be named.
-        /// If the path template is 'my_captures/example', then captures saved will be e.g.
-        /// 'my_captures/example_frame123.rdc' and 'my_captures/example_frame456.rdc'.<br/>
-        /// Relative paths will be saved relative to the process’s current working directory.<br/>
-        /// </summary>
-        /// <remarks>The default template is in a folder controlled by the UI - initially the system temporary folder, and the filename is the executable’s filename.</remarks>
-        [RenderDocApiVersion(1, 0)]
-        public static string CaptureFilePathTemplate
-        {
-            get
-            {
-                byte* ptr = Api->GetCaptureFilePathTemplate();
-                return Marshal.PtrToStringUTF8((nint)ptr)!;
-            }
-            set
-            {
-                fixed (byte* ptr = value.ToNullTerminatedByteArray())
-                {
-                    Api->SetCaptureFilePathTemplate(ptr);
-                }
-            }
-        }
-
-        /// <summary>
-        /// The amount of frame captures that have been made.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static int CaptureCount => Api->GetNumCaptures();
-
-        /// <summary>
-        /// Checks if the RenderDoc UI is currently connected to this process.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static bool IsTargetControlConnected => Api is not null && Api->IsTargetControlConnected() != 0;
-
-        /// <summary>
-        /// Checks if the current frame is capturing.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static bool IsFrameCapturing => Api is not null && Api->IsFrameCapturing() != 0;
-
-        /// <summary>
-        ///     Set one of the options for tweaking some behaviors of capturing.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be set.</param>
-        /// <param name="integer">the unsigned integer value to set for the option.</param>
-        /// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
-        /// <returns>
-        /// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
-        /// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
-        /// </returns>
-        [RenderDocApiVersion(1, 0)]
-        public static bool SetCaptureOption(CaptureOption option, uint integer)
-        {
-            return Api is not null && Api->SetCaptureOptionU32(option, integer) != 0;
-        }
-
-        /// <summary>
-        /// Set one of the options for tweaking some behaviors of capturing.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be set.</param>
-        /// <param name="boolean">the value to set for the option, converted to a 0 or 1 before setting.</param>
-        /// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
-        /// <returns>
-        /// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
-        /// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
-        /// </returns>
-        [RenderDocApiVersion(1, 0)]
-        public static bool SetCaptureOption(CaptureOption option, bool boolean)
-            => SetCaptureOption(option, boolean ? 1 : 0);
-
-        /// <summary>
-        /// Set one of the options for tweaking some behaviors of capturing.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be set.</param>
-        /// <param name="single">the floating point value to set for the option.</param>
-        /// <remarks>Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.</remarks>
-        /// <returns>
-        /// true, if the <paramref name="option"/> is valid, and the value set on the option is within valid ranges.<br/>
-        /// false, if the option is not a <see cref="CaptureOption"/>, or the value is not valid for the option.
-        /// </returns>
-        [RenderDocApiVersion(1, 0)]
-        public static bool SetCaptureOption(CaptureOption option, float single)
-        {
-            return Api is not null && Api->SetCaptureOptionF32(option, single) != 0;
-        }
-
-        /// <summary>
-        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>, writing it to an out parameter.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be retrieved.</param>
-        /// <param name="integer">the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum. Otherwise, <see cref="int.MaxValue"/>.</param>
-        [RenderDocApiVersion(1, 0)]
-        public static void GetCaptureOption(CaptureOption option, out uint integer)
-        {
-            integer = Api->GetCaptureOptionU32(option);
-        }
-
-        /// <summary>
-        ///     Gets the current value of one of the different options in <see cref="CaptureOption"/>, writing it to an out parameter.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be retrieved.</param>
-        /// <param name="single">the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum. Otherwise, -<see cref="float.MaxValue"/>.</param>
-        [RenderDocApiVersion(1, 0)]
-        public static void GetCaptureOption(CaptureOption option, out float single)
-        {
-            single = Api->GetCaptureOptionF32(option);
-        }
-
-        /// <summary>
-        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>,
-        /// converted to a boolean.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be retrieved.</param>
-        /// <returns>
-        /// the value of the capture option, converted to bool, if the option is a valid <see cref="CaptureOption"/> enum.
-        /// Otherwise, returns null.
-        /// </returns>
-        [RenderDocApiVersion(1, 0)]
-        public static bool? GetCaptureOptionBool(CaptureOption option)
-        {
-            if (Api is null) return false;
-
-            uint returnVal = GetCaptureOptionU32(option);
-            if (returnVal == uint.MaxValue)
-                return null;
-
-            return returnVal is not 0;
-        }
-
-        /// <summary>
-        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be retrieved.</param>
-        /// <returns>
-        /// the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum.
-        /// Otherwise, returns <see cref="int.MaxValue"/>.
-        /// </returns>
-        [RenderDocApiVersion(1, 0)]
-        public static uint GetCaptureOptionU32(CaptureOption option) => Api->GetCaptureOptionU32(option);
-
-        /// <summary>
-        /// Gets the current value of one of the different options in <see cref="CaptureOption"/>.
-        /// </summary>
-        /// <param name="option">specifies which capture option should be retrieved.</param>
-        /// <returns>
-        /// the value of the capture option, if the option is a valid <see cref="CaptureOption"/> enum.
-        /// Otherwise, returns -<see cref="float.MaxValue"/>.
-        /// </returns>
-        [RenderDocApiVersion(1, 0)]
-        public static float GetCaptureOptionF32(CaptureOption option) => Api->GetCaptureOptionF32(option);
-
-        /// <summary>
-        /// Changes the key bindings in-application for changing the focussed window.
-        /// </summary>
-        /// <param name="buttons">lists the keys to bind.</param>
-        [RenderDocApiVersion(1, 0)]
-        public static void SetFocusToggleKeys(ReadOnlySpan<InputButton> buttons)
-        {
-            if (Api is null) return;
-
-            fixed (InputButton* ptr = buttons)
-            {
-                Api->SetFocusToggleKeys(ptr, buttons.Length);
-            }
-        }
-
-        /// <summary>
-        /// Changes the key bindings in-application for triggering a capture on the current window.
-        /// </summary>
-        /// <param name="buttons">lists the keys to bind.</param>
-        [RenderDocApiVersion(1, 0)]
-        public static void SetCaptureKeys(ReadOnlySpan<InputButton> buttons)
-        {
-            if (Api is null) return;
-
-            fixed (InputButton* ptr = buttons)
-            {
-                Api->SetCaptureKeys(ptr, buttons.Length);
-            }
-        }
-
-        /// <summary>
-        /// Attempts to remove RenderDoc and its hooks from the target process.<br/>
-        /// It must be called as early as possible in the process, and will have undefined results
-        /// if any graphics API functions have been called.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static void RemoveHooks()
-        {
-            if (Api is null) return;
-
-            Api->RemoveHooks();
-        }
-
-        /// <summary>
-        /// Remove RenderDoc’s crash handler from the target process.<br/>
-        /// If you have your own crash handler that you want to handle any exceptions,
-        /// RenderDoc’s handler could interfere; so it can be disabled.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static void UnloadCrashHandler()
-        {
-            if (Api is null) return;
-
-            Api->UnloadCrashHandler();
-        }
-
-        /// <summary>
-        /// Trigger a capture as if the user had pressed one of the capture hotkeys.<br/>
-        /// The capture will be taken from the next frame presented to whichever window is considered current.
-        /// </summary>
-        [RenderDocApiVersion(1, 0)]
-        public static void TriggerCapture()
-        {
-            if (Api is null) return;
-
-            Api->TriggerCapture();
-        }
-
-
-        /// <summary>
-        /// Gets the details of all frame capture in the current session.
-        /// This simply calls <see cref="GetCapture"/> for each index available as specified by <see cref="CaptureCount"/>.
-        /// </summary>
-        /// <returns>An immutable array of structs representing RenderDoc Captures.</returns>
-        public static ImmutableArray<Capture> GetCaptures()
-        {
-            if (Api is null) return [];
-            int captureCount = CaptureCount;
-            if (captureCount is 0) return [];
-
-            ImmutableArray<Capture>.Builder captures = ImmutableArray.CreateBuilder<Capture>(captureCount);
-
-            for (int captureIndex = 0; captureIndex < captureCount; captureIndex++)
-            {
-                if (GetCapture(captureIndex) is { } capture)
-                    captures.Add(capture);
-            }
-
-            return captures.DrainToImmutable();
-        }
-
-        /// <summary>
-        /// Gets the details of a particular frame capture, as specified by an index from 0 to <see cref="CaptureCount"/> - 1.
-        /// </summary>
-        /// <param name="index">specifies which capture to return the details of. Must be less than the value returned by <see cref="CaptureCount"/>.</param>
-        /// <returns>A struct representing a RenderDoc Capture.</returns>
-        [RenderDocApiVersion(1, 0)]
-        public static Capture? GetCapture(int index)
-        {
-            if (Api is null) return null;
-
-            int length = 0;
-            if (Api->GetCapture(index, null, &length, null) == 0)
-            {
-                return null;
-            }
-
-            Span<byte> bytes = stackalloc byte[length + 1];
-            long timestamp;
-
-            fixed (byte* ptr = bytes)
-                Api->GetCapture(index, ptr, &length, &timestamp);
-
-            string fileName = Encoding.UTF8.GetString(bytes[length..]);
-            return new Capture(index, fileName, DateTimeOffset.FromUnixTimeSeconds(timestamp).DateTime);
-        }
-
-        /// <summary>
-        /// Determine the closest matching replay UI executable for the current RenderDoc module, and launch it.
-        /// </summary>
-        /// <param name="connectTargetControl">if the UI should immediately connect to the application.</param>
-        /// <param name="commandLine">string to be appended to the command line, e.g. a capture filename. If this parameter is null, the command line will be unmodified.</param>
-        /// <returns>true if the UI was successfully launched; false otherwise.</returns>
-        [RenderDocApiVersion(1, 0)]
-        public static bool LaunchReplayUI(bool connectTargetControl, string? commandLine = null)
-        {
-            if (Api is null) return false;
-
-            if (commandLine == null)
-            {
-                return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, null) != 0;
-            }
-
-            fixed (byte* ptr = commandLine.ToNullTerminatedByteArray())
-            {
-                return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, ptr) != 0;
-            }
-        }
-
-        /// <summary>
-        /// Explicitly sets which window is considered active.<br/>
-        /// The active window is the one that will be captured when the keybind to trigger a capture is pressed.
-        /// </summary>
-        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. Must be valid.</param>
-        /// <param name="hWindow">a handle to the platform window handle that will be set active. Must be valid.</param>
-        [RenderDocApiVersion(1, 0)]
-        public static void SetActiveWindow(nint hDevice, nint hWindow)
-        {
-            if (Api is null) return;
-
-            Api->SetActiveWindow((void*)hDevice, (void*)hWindow);
-        }
-
-        /// <summary>
-        /// Immediately begin a capture for the specified device/window combination.
-        /// </summary>
-        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
-        /// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
-        [RenderDocApiVersion(1, 0)]
-        public static void StartFrameCapture(nint hDevice, nint hWindow)
-        {
-            if (Api is null) return;
-
-            Api->StartFrameCapture((void*)hDevice, (void*)hWindow);
-        }
-
-        /// <summary>
-        /// Immediately end an active capture for the specified device/window combination.
-        /// </summary>
-        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
-        /// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
-        /// <returns>true if the capture succeeded; false otherwise.</returns>
-        [RenderDocApiVersion(1, 0)]
-        public static bool EndFrameCapture(nint hDevice, nint hWindow)
-        {
-            if (Api is null) return false;
-
-            return Api->EndFrameCapture((void*)hDevice, (void*)hWindow) != 0;
-        }
-
-        /// <summary>
-        /// Trigger multiple sequential frame captures as if the user had pressed one of the capture hotkeys before each frame.<br/>
-        /// The captures will be taken from the next frames presented to whichever window is considered current.<br/>
-        /// Each capture will be taken independently and saved to a separate file, with no reference to the other frames.
-        /// </summary>
-        /// <param name="numFrames">the number of frames to capture.</param>
-        /// <remarks>Requires RenderDoc API version 1.1</remarks>
-        [RenderDocApiVersion(1, 1)]
-        public static void TriggerMultiFrameCapture(uint numFrames)
-        {
-            if (Api is null) return;
-
-            AssertAtLeast(1, 1);
-            Api->TriggerMultiFrameCapture(numFrames);
-        }
-
-        /// <summary>
-        /// Adds an arbitrary comments field to the most recent capture,
-        /// which will then be displayed in the UI to anyone opening the capture.
-        /// <br/><br/>
-        /// This is equivalent to calling <see cref="SetCaptureFileComments"/> with a null first (fileName) parameter.
-        /// </summary>
-        /// <param name="comments">the comments to set in the capture file.</param>
-        /// <remarks>Requires RenderDoc API version 1.2</remarks>
-        public static void SetMostRecentCaptureFileComments(string comments)
-        {
-            if (Api is null) return;
-
-            AssertAtLeast(1, 2);
-
-            byte[] commentBytes = comments.ToNullTerminatedByteArray();
-
-            fixed (byte* pcomment = commentBytes)
-            {
-                Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
-            }
-        }
-
-        /// <summary>
-        /// Adds an arbitrary comments field to an existing capture on disk,
-        /// which will then be displayed in the UI to anyone opening the capture.
-        /// </summary>
-        /// <param name="fileName">the path to the capture file to set comments in. If this path is null or an empty string, the most recent capture file that has been created will be used.</param>
-        /// <param name="comments">the comments to set in the capture file.</param>
-        /// <remarks>Requires RenderDoc API version 1.2</remarks>
-        [RenderDocApiVersion(1, 2)]
-        public static void SetCaptureFileComments(string? fileName, string comments)
-        {
-            if (Api is null) return;
-
-            AssertAtLeast(1, 2);
-
-            byte[] commentBytes = comments.ToNullTerminatedByteArray();
-
-            fixed (byte* pcomment = commentBytes)
-            {
-                if (fileName is null)
-                {
-                    Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
-                }
-                else
-                {
-                    byte[] fileBytes = fileName.ToNullTerminatedByteArray();
-
-                    fixed (byte* pfile = fileBytes)
-                    {
-                        Api->SetCaptureFileComments(pfile, pcomment);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Similar to <see cref="EndFrameCapture"/>, but the capture contents will be discarded immediately, and not processed and written to disk.<br/>
-        /// This will be more efficient than <see cref="EndFrameCapture"/> if the frame capture is not needed.
-        /// </summary>
-        /// <param name="hDevice">a handle to the API ‘device’ object that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
-        /// <param name="hWindow">a handle to the platform window handle that will be set active. May be <see cref="nint.Zero"/> to wildcard match.</param>
-        /// <returns>true if the capture was discarded; false if there was an error or no capture was in progress.</returns>
-        /// <remarks>Requires RenderDoc API version 1.4</remarks>
-        [RenderDocApiVersion(1, 4)]
-        public static bool DiscardFrameCapture(nint hDevice, nint hWindow)
-        {
-            if (Api is null) return false;
-
-            AssertAtLeast(1, 4);
-            return Api->DiscardFrameCapture((void*)hDevice, (void*)hWindow) != 0;
-        }
-
-
-        /// <summary>
-        /// Requests that the currently connected replay UI raise its window to the top.<br/>
-        /// This is only possible if an instance of the replay UI is currently connected, otherwise this method does nothing.<br/>
-        /// This can be used in conjunction with <see cref="IsTargetControlConnected"/> and <see cref="LaunchReplayUI"/>,<br/> to intelligently handle showing the UI after making a capture.<br/><br/>
-        /// Given OS differences, it is not guaranteed that the UI will be successfully raised even if the request is passed on.<br/>
-        /// On some systems it may only be highlighted or otherwise indicated to the user.
-        /// </summary>
-        /// <returns>true if the request was passed onto the UI successfully; false if there is no UI connected or some other error occurred.</returns>
-        /// <remarks>Requires RenderDoc API version 1.5</remarks>
-        [RenderDocApiVersion(1, 5)]
-        public static bool ShowReplayUI()
-        {
-            if (Api is null) return false;
-
-            AssertAtLeast(1, 5);
-            return Api->ShowReplayUI() != 0;
-        }
-
-        /// <summary>
-        /// Sets a given title for the currently in-progress capture, which will be displayed in the UI.<br/>
-        /// This can be used either with a user-defined capture using a manual start and end,
-        /// or an automatic capture triggered by <see cref="TriggerCapture"/> or a keypress.<br/>
-        /// If multiple captures are ongoing at once, the title will be applied to the first capture to end only.<br/>
-        /// Any subsequent captures will not get any title unless the function is called again.
-        /// This function can only be called while a capture is in-progress,
-        /// after <see cref="StartFrameCapture"/> and before <see cref="EndFrameCapture"/>.<br/>
-        /// If it is called elsewhere it will have no effect.
-        /// If it is called multiple times within a capture, only the last title will have any effect.
-        /// </summary>
-        /// <param name="title">The title to set for the in-progress capture.</param>
-        /// <remarks>Requires RenderDoc API version 1.6</remarks>
-        [RenderDocApiVersion(1, 6)]
-        public static void SetCaptureTitle(string title)
-        {
-            if (Api is null) return;
-
-            AssertAtLeast(1, 6);
-            fixed (byte* ptr = title.ToNullTerminatedByteArray())
-                Api->SetCaptureTitle(ptr);
-        }
-
-        #region Dynamic Library loading
-
-        /// <summary>
-        /// Reload the internal RenderDoc API structure. Useful for manually refreshing <see cref="Api"/> while using process injection.
-        /// </summary>
-        /// <param name="ignoreAlreadyLoaded">Ignores the existing API function structure and overwrites it with a re-request.</param>
-        /// <param name="requiredVersion">The version of the RenderDoc API required by your application.</param>
-        public static void ReloadApi(bool ignoreAlreadyLoaded = false, RenderDocVersion? requiredVersion = null)
-        {
-            if (_loaded && !ignoreAlreadyLoaded)
-                return;
-
-            lock (typeof(RenderDoc))
-            {
-                // Prevent double loads.
-                if (_loaded && !ignoreAlreadyLoaded)
-                    return;
-
-                if (requiredVersion.HasValue)
-                    MinimumRequired = requiredVersion.Value;
-
-                _loaded = true;
-                _api = GetApi(MinimumRequired);
-
-                if (_api != null)
-                    AssertAtLeast(MinimumRequired);
-            }
-        }
-
-        private static RenderDocApi* _api = null;
-        private static bool _loaded;
-
-        private static RenderDocApi* Api
-        {
-            get
-            {
-                ReloadApi();
-                return _api;
-            }
-        }
-
-        private static readonly Regex _dynamicLibraryPattern = RenderDocApiDynamicLibraryRegex();
-
-        private static RenderDocApi* GetApi(RenderDocVersion minimumRequired = RenderDocVersion.Version_1_0_0)
-        {
-            foreach (ProcessModule module in Process.GetCurrentProcess().Modules)
-            {
-                string moduleName = module.FileName ?? string.Empty;
-
-                if (!_dynamicLibraryPattern.IsMatch(moduleName))
-                    continue;
-
-                if (!NativeLibrary.TryLoad(moduleName, out nint moduleHandle))
-                    return null;
-
-                if (!NativeLibrary.TryGetExport(moduleHandle, "RENDERDOC_GetAPI", out nint procAddress))
-                    return null;
-
-                var RENDERDOC_GetApi = (delegate* unmanaged[Cdecl]<RenderDocVersion, RenderDocApi**, int>)procAddress;
-
-                RenderDocApi* api;
-                return RENDERDOC_GetApi(minimumRequired, &api) != 0 ? api : null;
-            }
-
-            return null;
-        }
-
-        private static void AssertAtLeast(RenderDocVersion rdv, [CallerMemberName] string callee = "")
-        {
-            Version ver = rdv.SystemVersion;
-            AssertAtLeast(ver.Major, ver.Minor, ver.Build, callee);
-        }
-
-        private static void AssertAtLeast(int major, int minor, int patch = 0, [CallerMemberName] string callee = "")
-        {
-            if (!AssertVersionEnabled)
-                return;
-
-            if (Version!.Major < major)
-                goto fail;
-
-            if (Version.Major > major)
-                goto success;
-            if (Version.Minor < minor)
-                goto fail;
-            if (Version.Minor > minor)
-                goto success;
-            if (Version.Build < patch)
-                goto fail;
-
-            success:
-            return;
-
-            fail:
-            Version minVersion =
-                typeof(RenderDoc).GetMethod(callee)!.GetCustomAttribute<RenderDocApiVersionAttribute>()!.MinVersion;
-            throw new NotSupportedException(
-                $"This API was introduced in RenderDoc API {minVersion}. Current API version is {Version}.");
-        }
-
-        private static byte[] ToNullTerminatedByteArray(this string str, Encoding? encoding = null)
-        {
-            encoding ??= Encoding.UTF8;
-
-            return encoding.GetBytes(str + '\0');
-        }
-
-        [GeneratedRegex(@"(lib)?renderdoc(\.dll|\.so|\.dylib)(\.\d+)?",
-            RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
-        private static partial Regex RenderDocApiDynamicLibraryRegex();
-
-        #endregion
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/RenderDocApi.cs

@@ -1,51 +0,0 @@
-namespace Ryujinx.Graphics.RenderDocApi
-{
-#pragma warning disable CS0649
-    internal unsafe struct RenderDocApi
-    {
-        public delegate* unmanaged[Cdecl]<int*, int*, int*, void> GetApiVersion;
-
-        public delegate* unmanaged[Cdecl]<CaptureOption, uint, int> SetCaptureOptionU32;
-        public delegate* unmanaged[Cdecl]<CaptureOption, float, int> SetCaptureOptionF32;
-        public delegate* unmanaged[Cdecl]<CaptureOption, uint> GetCaptureOptionU32;
-        public delegate* unmanaged[Cdecl]<CaptureOption, float> GetCaptureOptionF32;
-
-        public delegate* unmanaged[Cdecl]<InputButton*, int, void> SetFocusToggleKeys;
-        public delegate* unmanaged[Cdecl]<InputButton*, int, void> SetCaptureKeys;
-
-        public delegate* unmanaged[Cdecl]<OverlayBits> GetOverlayBits;
-        public delegate* unmanaged[Cdecl]<OverlayBits, OverlayBits, void> MaskOverlayBits;
-
-        public delegate* unmanaged[Cdecl]<void> RemoveHooks;
-        public delegate* unmanaged[Cdecl]<void> UnloadCrashHandler;
-        public delegate* unmanaged[Cdecl]<byte*, void> SetCaptureFilePathTemplate;
-        public delegate* unmanaged[Cdecl]<byte*> GetCaptureFilePathTemplate;
-
-        public delegate* unmanaged[Cdecl]<int> GetNumCaptures;
-        public delegate* unmanaged[Cdecl]<int, byte*, int*, long*, uint> GetCapture;
-        public delegate* unmanaged[Cdecl]<void> TriggerCapture;
-        public delegate* unmanaged[Cdecl]<uint> IsTargetControlConnected;
-        public delegate* unmanaged[Cdecl]<uint, byte*, uint> LaunchReplayUI;
-
-        public delegate* unmanaged[Cdecl]<void*, void*, void> SetActiveWindow;
-        public delegate* unmanaged[Cdecl]<void*, void*, void> StartFrameCapture;
-        public delegate* unmanaged[Cdecl]<uint> IsFrameCapturing;
-        public delegate* unmanaged[Cdecl]<void*, void*, uint> EndFrameCapture;
-
-        // 1.1
-        public delegate* unmanaged[Cdecl]<uint, void> TriggerMultiFrameCapture;
-
-        // 1.2
-        public delegate* unmanaged[Cdecl]<byte*, byte*, void> SetCaptureFileComments;
-
-        // 1.3
-        public delegate* unmanaged[Cdecl]<void*, void*, uint> DiscardFrameCapture;
-
-        // 1.5
-        public delegate* unmanaged[Cdecl]<uint> ShowReplayUI;
-
-        // 1.6
-        public delegate* unmanaged[Cdecl]<byte*, void> SetCaptureTitle;
-    }
-#pragma warning restore CS0649
-}

src/Ryujinx.Graphics.RenderDocApi/RenderDocApiVersionAttribute.cs

@@ -1,16 +0,0 @@
-
-using System;
-
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property)]
-    public sealed class RenderDocApiVersionAttribute : Attribute
-    {
-        public Version MinVersion { get; }
-
-        public RenderDocApiVersionAttribute(int major, int minor, int patch = 0)
-        {
-            MinVersion = new Version(major, minor, patch);
-        }
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/RenderDocVersion.cs

@@ -1,47 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.RenderDocApi
-{
-    public enum RenderDocVersion
-    {
-        Version_1_0_0 = 10000,
-        Version_1_0_1 = 10001,
-        Version_1_0_2 = 10002,
-        Version_1_1_0 = 10100,
-        Version_1_1_1 = 10101,
-        Version_1_1_2 = 10102,
-        Version_1_2_0 = 10200,
-        Version_1_3_0 = 10300,
-        Version_1_4_0 = 10400,
-        Version_1_4_1 = 10401,
-        Version_1_4_2 = 10402,
-        Version_1_5_0 = 10500,
-        Version_1_6_0 = 10600,
-    }
-    
-    public static partial class Helpers
-    {
-        extension(RenderDocVersion rdv)
-        {
-            public Version SystemVersion
-            {
-                get
-                {
-                    int i = (int)rdv;
-                    return new (i / 10000, (i % 10000) / 100, i % 100);
-                }
-            }
-        }
-
-        extension(Version sv)
-        {
-            public RenderDocVersion RenderDocVersion
-            {
-                get
-                {
-                    return (RenderDocVersion)(sv.Major * 10000 + sv.Minor * 100 + sv.Build);
-                }
-            }
-        }
-    }
-}

src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj

@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>disable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
-</Project>

src/Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs

@@ -1790,7 +1790,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
                     {
                         (_, varType) = IoMap.GetSpirvBuiltIn(ioVariable);
 
-                        if (context.Definitions.Stage.IsVtg() && IoMap.IsPerVertexBuiltIn(ioVariable))
+                        if (IoMap.IsPerVertexBuiltIn(ioVariable))
                         {
                             perVertexBuiltIn = ioVariable;
                             ioVariable = IoVariable.Position;

src/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs

@@ -70,7 +70,19 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
             Operand bindlessHandle = texOp.GetSource(0);
 
-            if (!IsBindlessAccessAllowed(bindlessHandle))
+            if (bindlessHandle.AsgOp is PhiNode phi)
+            {
+                for (int srcIndex = 0; srcIndex < phi.SourcesCount; srcIndex++)
+                {
+                    Operand phiSource = phi.GetSource(srcIndex);
+
+                    if (phiSource.AsgOp is not PhiNode && !IsBindlessAccessAllowed(phiSource))
+                    {
+                        return false;
+                    }
+                }
+            }
+            else if (!IsBindlessAccessAllowed(bindlessHandle))
             {
                 return false;
             }
@@ -88,10 +100,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
             texOp.SetSource(0, textureIndex);
 
-            // Buffer textures use a TIC/BufferView only and never consume a sampler.
-            // Avoiding a sampler descriptor array here is especially important for bindless
-            // texture buffers, where the array can span the entire sampler pool for no benefit.
-            bool hasSampler = !texOp.Inst.IsImage() && texOp.Type != SamplerType.TextureBuffer;
+            bool hasSampler = !texOp.Inst.IsImage();
 
             SetBindingPair textureSetAndBinding = resourceManager.GetTextureOrImageBinding(
                 texOp.Inst,
@@ -134,112 +143,26 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
         private static bool IsBindlessAccessAllowed(Operand bindlessHandle)
         {
-            // Walk only SSA merges and integer operations that can transparently construct
-            // or select a packed texture/sampler handle. Do not walk arbitrary operations:
-            // finding an unrelated resource load elsewhere in the SSA graph must not enable
-            // descriptor-array access for this handle.
-            const int MaxVisitedOperands = 256;
-            const int MaxDepth = 64;
-
-            Stack<(Operand Operand, int Depth)> work = new();
-            HashSet<Operand> visited = new();
-
-            work.Push((bindlessHandle, 0));
-
-            while (work.Count != 0 && visited.Count < MaxVisitedOperands)
+            if (bindlessHandle.Type == OperandType.ConstantBuffer)
             {
-                (Operand operand, int depth) = work.Pop();
+                // Bindless access with handles from constant buffer is allowed.
 
-                if (operand == null || depth > MaxDepth || !visited.Add(operand))
-                {
-                    continue;
-                }
-
-                if (operand.Type == OperandType.ConstantBuffer)
-                {
-                    // Constant buffers are accepted by the existing direct-handle path and
-                    // remain accepted when SSA merges or integer handle arithmetic obscure them.
-                    return true;
-                }
-
-                if (operand.AsgOp is PhiNode phi)
-                {
-                    for (int index = 0; index < phi.SourcesCount; index++)
-                    {
-                        Operand source = phi.GetSource(index);
-
-                        if (source.Type != OperandType.Undefined)
-                        {
-                            work.Push((source, depth + 1));
-                        }
-                    }
-
-                    continue;
-                }
-
-                if (operand.AsgOp is not Operation operation)
-                {
-                    continue;
-                }
-
-                Instruction inst = operation.Inst & Instruction.Mask;
-
-                if (inst == Instruction.Load)
-                {
-                    // Preserve the performance restriction. Static CBUF operands are already
-                    // accepted above; accept their dynamically indexed Load form as the same
-                    // resource class, plus the existing shader-input and storage-buffer sources.
-                    // Other loads remain traversal barriers and cannot authorize a pool array.
-                    if (operation.StorageKind == StorageKind.ConstantBuffer ||
-                        operation.StorageKind == StorageKind.Input ||
-                        operation.StorageKind == StorageKind.StorageBuffer)
-                    {
-                        return true;
-                    }
-
-                    continue;
-                }
-
-                if (!IsHandleConstructionOperation(inst))
-                {
-                    // Texture/image operations, arbitrary loads, floating-point conversions,
-                    // calls and other unrelated calculations are deliberate traversal barriers.
-                    continue;
-                }
-
-                for (int index = 0; index < operation.SourcesCount; index++)
-                {
-                    work.Push((operation.GetSource(index), depth + 1));
-                }
+                return true;
             }
 
-            return false;
-        }
+            if (bindlessHandle.AsgOp is not Operation handleOp ||
+                handleOp.Inst != Instruction.Load ||
+                (handleOp.StorageKind != StorageKind.Input && handleOp.StorageKind != StorageKind.StorageBuffer))
+            {
+                // Right now, we only allow bindless access when the handle comes from a shader input or storage buffer.
+                // This is an artificial limitation to prevent it from being used in cases where it
+                // would have a large performance impact of loading all textures in the pool.
+                // It might be removed in the future, if we can mitigate the performance impact.
 
-        private static bool IsHandleConstructionOperation(Instruction inst)
-        {
-            return inst is
-                Instruction.Add or
-                Instruction.Subtract or
-                Instruction.Multiply or
-                Instruction.MultiplyHighS32 or
-                Instruction.MultiplyHighU32 or
-                Instruction.BitwiseAnd or
-                Instruction.BitwiseExclusiveOr or
-                Instruction.BitwiseNot or
-                Instruction.BitwiseOr or
-                Instruction.BitfieldExtractS32 or
-                Instruction.BitfieldExtractU32 or
-                Instruction.BitfieldInsert or
-                Instruction.ShiftLeft or
-                Instruction.ShiftRightS32 or
-                Instruction.ShiftRightU32 or
-                Instruction.MinimumU32 or
-                Instruction.MaximumU32 or
-                Instruction.ClampU32 or
-                Instruction.ConditionalSelect or
-                Instruction.Copy or
-                Instruction.VectorExtract;
+                return false;
+            }
+
+            return true;
         }
 
         private static bool TryConvertBindless(BasicBlock block, ResourceManager resourceManager, IGpuAccessor gpuAccessor, TextureOperation texOp)

src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs

@@ -32,29 +32,6 @@ namespace Ryujinx.Graphics.Vulkan
         public bool HasDepthStencil { get; private set; }
         public int ColorAttachmentsCount => AttachmentsCount - (HasDepthStencil ? 1 : 0);
 
-        public bool SetVirtualSize(uint width, uint height, uint layers)
-        {
-            if (AttachmentsCount != 0)
-            {
-                return false;
-            }
-
-            width = Math.Max(1u, width);
-            height = Math.Max(1u, height);
-            layers = Math.Max(1u, layers);
-
-            if (Width == width && Height == height && Layers == layers)
-            {
-                return false;
-            }
-
-            Width = width;
-            Height = height;
-            Layers = layers;
-
-            return true;
-        }
-
         public FramebufferParams(Device device, TextureView view, uint width, uint height)
         {
             Format format = view.Info.Format;

src/Ryujinx.Graphics.Vulkan/HelperShader.cs

@@ -406,10 +406,10 @@ namespace Ryujinx.Graphics.Vulkan
 
             if (dstIsDepthOrStencil)
             {
-                _pipeline.SetProgram(src.Info.Target.IsMultisample ? _programDepthBlitMs : _programDepthBlit);
+                _pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programDepthBlitMs : _programDepthBlit);
                 _pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
             }
-            else if (src.Info.Target.IsMultisample)
+            else if (src.Info.Target.IsMultisample())
             {
                 _pipeline.SetProgram(_programColorBlitMs);
             }
@@ -566,12 +566,12 @@ namespace Ryujinx.Graphics.Vulkan
 
             if (isDepth)
             {
-                _pipeline.SetProgram(src.Info.Target.IsMultisample ? _programDepthBlitMs : _programDepthBlit);
+                _pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programDepthBlitMs : _programDepthBlit);
                 _pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
             }
             else
             {
-                _pipeline.SetProgram(src.Info.Target.IsMultisample ? _programStencilBlitMs : _programStencilBlit);
+                _pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programStencilBlitMs : _programStencilBlit);
                 _pipeline.SetStencilTest(CreateStencilTestDescriptor(true));
             }
 

src/Ryujinx.Graphics.Vulkan/Helpers.cs

@@ -1,32 +0,0 @@
-using Silk.NET.Vulkan;
-using System.Runtime.CompilerServices;
-
-namespace Ryujinx.Graphics.Vulkan
-{
-    public static class Helpers
-    {
-        extension(Vk api)
-        {
-            /// <summary>
-            ///     C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
-            /// </summary>
-            /// <returns>The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the <see cref="Vk"/>'s <see cref="Instance"/> pointer.</returns>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public unsafe void* GetRenderDocDevicePointer() =>
-                api.CurrentInstance is not null
-                    ? api.CurrentInstance.Value.GetRenderDocDevicePointer()
-                    : null;
-        }
-
-        extension(Instance instance)
-        {
-            /// <summary>
-            ///     C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
-            /// </summary>
-            /// <returns>The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the <see cref="Instance"/>'s pointer.</returns>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public unsafe void* GetRenderDocDevicePointer()
-                => (*((void**)(instance.Handle)));
-        }
-    }
-}

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -843,11 +843,6 @@ namespace Ryujinx.Graphics.Vulkan
         public void SetImage(ShaderStage stage, int binding, ITexture image)
         {
             _descriptorSetUpdater.SetImage(Cbs, stage, binding, image);
-
-            if (stage == ShaderStage.Fragment && image is TextureView view)
-            {
-                FramebufferParams?.SetVirtualSize((uint)view.Width, (uint)view.Height, (uint)view.Layers);
-            }
         }
 
         public void SetImage(int binding, Auto<DisposableImageView> image)
@@ -1612,24 +1607,6 @@ namespace Ryujinx.Graphics.Vulkan
 
         private bool RecreateGraphicsPipelineIfNeeded()
         {
-            if (FramebufferParams != null &&
-                FramebufferParams.AttachmentsCount == 0 &&
-                FramebufferParams.Width == 1 &&
-                FramebufferParams.Height == 1 &&
-                DynamicState.ViewportsCount != 0)
-            {
-                // An attachmentless fragment pass can reach its first draw before the storage
-                // image descriptor is rebound. At that point the null framebuffer still has
-                // its constructor fallback of 1x1, even though the guest viewport already
-                // describes the real render area. Seed the virtual framebuffer from that
-                // viewport so the first storage-image draw is not clipped to one pixel.
-                Silk.NET.Vulkan.Viewport viewport = DynamicState.Viewports[0];
-                uint width = (uint)Math.Max(1f, Math.Abs(viewport.Width));
-                uint height = (uint)Math.Max(1f, Math.Abs(viewport.Height));
-
-                FramebufferParams.SetVirtualSize(width, height, 1);
-            }
-
             if (AutoFlush.ShouldFlushDraw(DrawCount))
             {
                 Gd.FlushAllCommands();

src/Ryujinx.Graphics.Vulkan/TextureStorage.cs

@@ -79,7 +79,7 @@ namespace Ryujinx.Graphics.Vulkan
             _device = device;
             _info = info;
 
-            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample;
+            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
 
             VkFormat format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format, isMsImageStorageSupported);
             uint levels = (uint)info.Levels;
@@ -323,7 +323,7 @@ namespace Ryujinx.Graphics.Vulkan
                 usage |= ImageUsageFlags.ColorAttachmentBit;
             }
 
-            if (format.IsImageCompatible() && (isMsImageStorageSupported || !target.IsMultisample))
+            if (format.IsImageCompatible() && (isMsImageStorageSupported || !target.IsMultisample()))
             {
                 usage |= ImageUsageFlags.StorageBit;
             }

src/Ryujinx.Graphics.Vulkan/TextureView.cs

@@ -61,7 +61,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             gd.Textures.Add(this);
 
-            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample;
+            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
 
             VkFormat format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format, isMsImageStorageSupported);
             ImageUsageFlags usage = TextureStorage.GetImageUsage(info.Format, info.Target, gd.Capabilities, isMsImageStorageSupported) & storage.UsageFlags;
@@ -126,7 +126,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             ImageUsageFlags shaderUsage = ImageUsageFlags.SampledBit;
 
-            if (info.Format.IsImageCompatible() && (_gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample))
+            if (info.Format.IsImageCompatible() && (_gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample()))
             {
                 shaderUsage |= ImageUsageFlags.StorageBit;
             }
@@ -225,12 +225,12 @@ namespace Ryujinx.Graphics.Vulkan
             Image srcImage = src.GetImage().Get(cbs).Value;
             Image dstImage = dst.GetImage().Get(cbs).Value;
 
-            if (!dst.Info.Target.IsMultisample && Info.Target.IsMultisample)
+            if (!dst.Info.Target.IsMultisample() && Info.Target.IsMultisample())
             {
                 int layers = Math.Min(Info.GetLayers(), dst.Info.GetLayers() - firstLayer);
                 _gd.HelperShader.CopyMSToNonMS(_gd, cbs, src, dst, 0, firstLayer, layers);
             }
-            else if (dst.Info.Target.IsMultisample && !Info.Target.IsMultisample)
+            else if (dst.Info.Target.IsMultisample() && !Info.Target.IsMultisample())
             {
                 int layers = Math.Min(Info.GetLayers(), dst.Info.GetLayers() - firstLayer);
                 _gd.HelperShader.CopyNonMSToMS(_gd, cbs, src, dst, 0, firstLayer, layers);
@@ -287,11 +287,11 @@ namespace Ryujinx.Graphics.Vulkan
             Image srcImage = src.GetImage().Get(cbs).Value;
             Image dstImage = dst.GetImage().Get(cbs).Value;
 
-            if (!dst.Info.Target.IsMultisample && Info.Target.IsMultisample)
+            if (!dst.Info.Target.IsMultisample() && Info.Target.IsMultisample())
             {
                 _gd.HelperShader.CopyMSToNonMS(_gd, cbs, src, dst, srcLayer, dstLayer, 1);
             }
-            else if (dst.Info.Target.IsMultisample && !Info.Target.IsMultisample)
+            else if (dst.Info.Target.IsMultisample() && !Info.Target.IsMultisample())
             {
                 _gd.HelperShader.CopyNonMSToMS(_gd, cbs, src, dst, srcLayer, dstLayer, 1);
             }

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -166,15 +166,13 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
             string[] buttons = GetButtonsText(module, description, "DlgBtn");
 
-            (uint Module, uint Description) errorCodeTuple = (module, uint.Parse(description.ToString("0000")));
-
-            bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
+            bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons);
             if (showDetails)
             {
                 message = GetMessageText(module, description, "FlvMsg");
                 buttons = GetButtonsText(module, description, "FlvBtn");
 
-                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
+                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons);
             }
         }
 

src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs

@@ -27,19 +27,9 @@ namespace Ryujinx.HLE.HOS.Applets
             _normalSession = normalSession;
             _interactiveSession = interactiveSession;
 
-            UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
-            if (selected == null)
-            {
-                _normalSession.Push(BuildResponse());
-            }
-            else if (selected.UserId == new UserId("00000000000000000000000000000080"))
-            {
-                _normalSession.Push(BuildGuestResponse());
-            }
-            else
-            {
-                _normalSession.Push(BuildResponse(selected));
-            }
+            // TODO(jduncanator): Parse PlayerSelectConfig from input data
+            _normalSession.Push(BuildResponse());
+
             AppletStateChanged?.Invoke(this, null);
 
             _system.ReturnFocus();
@@ -47,34 +37,16 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        private byte[] BuildResponse(UserProfile selectedUser)
+        private byte[] BuildResponse()
         {
+            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
+
             using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
             using BinaryWriter writer = new(stream);
 
             writer.Write((ulong)PlayerSelectResult.Success);
 
-            selectedUser.UserId.Write(writer);
-
-            return stream.ToArray();
-        }
-
-        private byte[] BuildGuestResponse()
-        {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-            using BinaryWriter writer = new(stream);
-
-            writer.Write(new byte());
-
-            return stream.ToArray();
-        }
-        
-        private byte[] BuildResponse()
-        {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-            using BinaryWriter writer = new(stream);
-
-            writer.Write((ulong)PlayerSelectResult.Failure);
+            currentUser.UserId.Write(writer);
 
             return stream.ToArray();
         }

src/Ryujinx.HLE/HOS/ArmProcessContext.cs

@@ -1,5 +1,4 @@
 using ARMeilleure.Memory;
-using ARMeilleure.Translation.PTC;
 using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Kernel.Process;
@@ -10,10 +9,12 @@ namespace Ryujinx.HLE.HOS
     interface IArmProcessContext : IProcessContext
     {
         IDiskCacheLoadState Initialize(
-            PtcCacheInfo cacheInfo,
+            string titleIdText,
+            string displayVersion,
             bool diskCacheEnabled,
             ulong codeAddress,
-            ulong codeSize);
+            ulong codeSize,
+            string cacheSelector);
     }
 
     class ArmProcessContext<T> : IArmProcessContext where T : class, IVirtualMemoryManagerTracked, IMemoryManager
@@ -63,13 +64,15 @@ namespace Ryujinx.HLE.HOS
         }
 
         public IDiskCacheLoadState Initialize(
-            PtcCacheInfo cacheInfo,
+            string titleIdText,
+            string displayVersion,
             bool diskCacheEnabled,
             ulong codeAddress,
-            ulong codeSize)
+            ulong codeSize,
+            string cacheSelector)
         {
             _cpuContext.PrepareCodeRange(codeAddress, codeSize);
-            return _cpuContext.LoadDiskCache(cacheInfo, diskCacheEnabled);
+            return _cpuContext.LoadDiskCache(titleIdText, displayVersion, diskCacheEnabled, cacheSelector);
         }
 
         public void InvalidateCacheRegion(ulong address, ulong size)

src/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs

@@ -1,4 +1,3 @@
-using ARMeilleure.Translation.PTC;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Cpu;
@@ -8,7 +7,6 @@ using Ryujinx.Cpu.LightningJit;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Kernel;
 using Ryujinx.HLE.HOS.Kernel.Process;
-using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.Memory;
 using System;
 using System.Runtime.InteropServices;
@@ -19,10 +17,8 @@ namespace Ryujinx.HLE.HOS
     {
         private readonly ITickSource _tickSource;
         private readonly GpuContext _gpu;
-        private readonly ulong _programId;
-        private readonly byte _programIndex;
+        private readonly string _titleIdText;
         private readonly string _displayVersion;
-        private readonly ProcessKind _processKind;
         private readonly bool _diskCacheEnabled;
         private readonly string _diskCacheSelector;
         private readonly ulong _codeAddress;
@@ -33,10 +29,8 @@ namespace Ryujinx.HLE.HOS
         public ArmProcessContextFactory(
             ITickSource tickSource,
             GpuContext gpu,
-            ulong programId,
-            byte programIndex,
+            string titleIdText,
             string displayVersion,
-            ProcessKind processKind,
             bool diskCacheEnabled,
             string diskCacheSelector,
             ulong codeAddress,
@@ -44,10 +38,8 @@ namespace Ryujinx.HLE.HOS
         {
             _tickSource = tickSource;
             _gpu = gpu;
-            _programId = programId;
-            _programIndex = programIndex;
+            _titleIdText = titleIdText;
             _displayVersion = displayVersion;
-            _processKind = processKind;
             _diskCacheEnabled = diskCacheEnabled;
             _diskCacheSelector = diskCacheSelector;
             _codeAddress = codeAddress;
@@ -129,18 +121,8 @@ namespace Ryujinx.HLE.HOS
             }
 
             string cacheSelector = _diskCacheSelector ?? "default";
-            string programIdText = _programId == 0 ? string.Empty : $"{_programId:x16}";
-            string applicationIdText = _programId == 0 ? string.Empty : $"{_programId & ~0xFul:x16}";
-            PtcCacheInfo cacheInfo = new(
-                pid,
-                programIdText,
-                applicationIdText,
-                _programIndex,
-                _displayVersion,
-                _processKind.ToString(),
-                cacheSelector);
 
-            DiskCacheLoadState = processContext.Initialize(cacheInfo, _diskCacheEnabled, _codeAddress, _codeSize);
+            DiskCacheLoadState = processContext.Initialize(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, cacheSelector);
 
             return processContext;
         }

src/Ryujinx.HLE/HOS/Kernel/Common/KSystemControl.cs

@@ -26,12 +26,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
             {
                 MemoryArrange.MemoryArrange4GiB or
                 MemoryArrange.MemoryArrange4GiBSystemDev or
-                MemoryArrange.MemoryArrange6GiBAppletDev => 3173 * MiB,
+                MemoryArrange.MemoryArrange6GiBAppletDev => 3152 * MiB,
                 MemoryArrange.MemoryArrange4GiBAppletDev => 2048 * MiB,
-                MemoryArrange.MemoryArrange6GiB => 4804 * MiB,
-                MemoryArrange.MemoryArrange8GiB => 6852 * MiB,
-                MemoryArrange.MemoryArrange10GiB => 8900 * MiB,
-                MemoryArrange.MemoryArrange12GiB => 10948 * MiB,
+                MemoryArrange.MemoryArrange6GiB => 4783 * MiB,
+                MemoryArrange.MemoryArrange8GiB => 6831 * MiB,
+                MemoryArrange.MemoryArrange10GiB => 8879 * MiB,
+                MemoryArrange.MemoryArrange12GiB => 10927 * MiB,
                 _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."),
             };
         }

src/Ryujinx.HLE/HOS/Kernel/Threading/KAddressArbiter.cs

@@ -15,6 +15,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
         private readonly Dictionary<ulong, List<KThread>> _condVarThreads;
         private readonly Dictionary<ulong, List<KThread>> _arbiterThreads;
+        private readonly ByDynamicPriority _byDynamicPriority;
 
         public KAddressArbiter(KernelContext context)
         {
@@ -22,6 +23,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
             _condVarThreads = [];
             _arbiterThreads = [];
+            _byDynamicPriority = new ByDynamicPriority();
         }
 
         public Result ArbitrateLock(int ownerHandle, ulong mutexAddress, int requesterHandle)
@@ -140,9 +142,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
             if (_condVarThreads.TryGetValue(condVarAddress, out List<KThread> threads))
             {
-                int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
-
+                int i = 0;
 
+                if (threads.Count > 0)
+                {
+                    i = threads.BinarySearch(currentThread, _byDynamicPriority);
+                    if (i < 0) i = ~i;
+                }
+                
                 threads.Insert(i, currentThread);
             }
             else
@@ -325,9 +332,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 
                 if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
                 {
-                    int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
-
+                    int i = 0;
 
+                    if (threads.Count > 0)
+                    {
+                        i = threads.BinarySearch(currentThread, _byDynamicPriority);
+                        if (i < 0) i = ~i;
+                    }
+                
                     threads.Insert(i, currentThread);
                 }
                 else
@@ -412,9 +424,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 
                 if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
                 {
-                    int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
-
+                    int i = 0;
 
+                    if (threads.Count > 0)
+                    {
+                        i = threads.BinarySearch(currentThread, _byDynamicPriority);
+                        if (i < 0) i = ~i;
+                    }
+                
                     threads.Insert(i, currentThread);
                 }
                 else
@@ -610,28 +627,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             return validCount;
         }
         
-        private static int FindDynamicPriorityFifoInsertionIndex(List<KThread> threads, KThread currentThread)
+        private class ByDynamicPriority : IComparer<KThread>
         {
-            int low = 0;
-            int high = threads.Count;
-
-            // Lower numeric values represent higher priorities. Use upper-bound insertion
-            // to preserve FIFO order among waiters with the same dynamic priority.
-            while (low < high)
+            public int Compare(KThread x, KThread y)
             {
-                int middle = low + ((high - low) >> 1);
-
-                if (threads[middle].DynamicPriority <= currentThread.DynamicPriority)
-                {
-                    low = middle + 1;
-                }
-                else
-                {
-                    high = middle;
-                }
+                return x!.DynamicPriority.CompareTo(y!.DynamicPriority);
             }
-
-            return low;
         }
     }
 }

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -783,28 +783,8 @@ namespace Ryujinx.HLE.HOS
             }
 
             List<Cheat> cheats = mods.Cheats;
-            Dictionary<string, ulong> processExes = new();
-
-            foreach ((string buildId, ulong codeAddress) in tamperInfo.BuildIds.Zip(tamperInfo.CodeAddresses))
-            {
-                string normalizedBuildId = buildId[..Math.Min(Cheat.CheatIdSize, buildId.Length)];
-
-                if (processExes.TryGetValue(normalizedBuildId, out ulong existingAddress))
-                {
-                    if (existingAddress != codeAddress)
-                    {
-                        Logger.Warning?.Print(
-                            LogClass.ModLoader,
-                            $"Duplicate BuildId prefix '{normalizedBuildId}' has different code addresses. " +
-                            $"Existing: 0x{existingAddress:X}, duplicate: 0x{codeAddress:X}. " +
-                            $"Keeping the first one.");
-                    }
-
-                    continue;
-                }
-
-                processExes.Add(normalizedBuildId, codeAddress);
-            }
+            Dictionary<string, ulong> processExes = tamperInfo.BuildIds.Zip(tamperInfo.CodeAddresses, (k, v) => new { k, v })
+                .ToDictionary(x => x.k[..Math.Min(Cheat.CheatIdSize, x.k.Length)], x => x.v);
 
             foreach (Cheat cheat in cheats)
             {

src/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs

@@ -71,14 +71,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
             return _applicationServiceServer.IsUserRegistrationRequestPermitted(context);
         }
 
-        [CommandCmif(51)] // 1.0.0 – 18.1.0
-        // TrySelectUserWithoutInteraction(bool) -> nn::account::Uid
-        public ResultCode TrySelectUserWithoutInteractionDeprecated(ServiceCtx context)
-        {
-            return _applicationServiceServer.TrySelectUserWithoutInteraction(context);
-        }
-
-        [CommandCmif(52)] // 19.0.0+
+        [CommandCmif(51)]
         // TrySelectUserWithoutInteraction(bool) -> nn::account::Uid
         public ResultCode TrySelectUserWithoutInteraction(ServiceCtx context)
         {

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs

@@ -12,23 +12,12 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
 {
     class ICommonStateGetter : DisposableIpcService
     {
-        // Nintendo serves the VR goggle commands based on Title ID, apparently.
-        private static ReadOnlySpan<ulong> _supportedVRGoggleTitles =>
-        [
-            0x0100CA001D972000, // Nintendo Classics: Virtual Boy NSO
-            0x0100BFC01D976000  // Nintendo Classics: Virtual Boy NSO
-        ];
-        
-        private int _resolutionWidth = 1280;
-        private int _resolutionHeight = 720;
-        
         private readonly ServiceCtx _context;
 
         private readonly Apm.ManagerServer _apmManagerServer;
         private readonly Apm.SystemManagerServer _apmSystemManagerServer;
 
         private bool _vrModeEnabled;
-        private bool _vrMode3dEnabled;
 #pragma warning disable CS0414, IDE0052 // Remove unread private member
         private bool _lcdBacklighOffEnabled;
         private bool _requestExitToLibraryAppletAtExecuteNextProgramEnabled;
@@ -164,47 +153,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
 
-        [CommandCmif(30)]
-        // GetHomeButtonReaderLockAccessor() -> nn::am::service::ILockAccessor
-        public ResultCode GetHomeButtonReaderLockAccessor(ServiceCtx context)
-        {
-            // We currently do not have any home button functionality, so it's fine to stub this for now.
-            // Similar to using GetReaderLockAccessorEx() with inval=0.
-            Logger.Stub?.PrintStub(LogClass.ServiceAm);
-            MakeObject(context, new ILockAccessor(context));
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(31)] // 2.0.0 +
-        // GetReaderLockAccessorEx(uint unknown) -> nn::am::service::ILockAccessor
-        public ResultCode GetReaderLockAccessorEx(ServiceCtx context)
-        {
-            uint unknown = context.RequestData.ReadUInt32();
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { unknown });
-            if (unknown < 0 || unknown > 3)
-            {
-                throw new ArgumentOutOfRangeException(nameof(unknown));
-            }
-            
-            MakeObject(context, new ILockAccessor(context));
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(32)] // 2.0.0+
-        // GetWriterLockAccessorEx(uint unknown) -> nn::am::service::ILockAccessor
-        public ResultCode GetWriterLockAccessorEx(ServiceCtx context)
-        {
-            uint unknown = context.RequestData.ReadUInt32();
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { unknown });
-            if (unknown < 0 || unknown > 3)
-            {
-                throw new ArgumentOutOfRangeException(nameof(unknown));
-            }
-            
-            MakeObject(context, new ILockAccessor(context));
-            return ResultCode.Success;
-        }
-
         [CommandCmif(50)] // 3.0.0+
         // IsVrModeEnabled() -> b8
         public ResultCode IsVrModeEnabled(ServiceCtx context)
@@ -229,8 +177,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         // SetLcdBacklighOffEnabled(b8)
         public ResultCode SetLcdBacklighOffEnabled(ServiceCtx context)
         {
-            // NOTE: Service sets a private field here, maybe this field is used somewhere else to turn off the backlight.
-            //       Since we don't support the backlight feature, it's fine to stub it.
+            // NOTE: Service sets a private field here, maybe this field is used somewhere else to turned off the backlight.
+            //       Since we don't support backlight, it's fine to do nothing.
 
             _lcdBacklighOffEnabled = context.RequestData.ReadBoolean();
 
@@ -350,43 +298,18 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return (ResultCode)_apmSystemManagerServer.GetCurrentPerformanceConfiguration(context);
         }
 
-        [CommandCmif(130)] // 21.0.0+
-        // EnableStartupLogoDisappearedMessage()
-        public ResultCode EnableStartupLogoDisappearedMessage(ServiceCtx context)
-        {
-            // NOTE: Service only delivers the message once the startup logo has actually
-            //       disappeared. We never display one, so it is already deliverable. Callers
-            //       gate their first frame on this message and hang without it.
-
-            AppletStateMgr appletState = context.Device.System.AppletState;
-
-            appletState.Messages.Enqueue(AppletMessage.StartupLogoDisappeared);
-            appletState.MessageEvent.ReadableEvent.Signal();
-
-            return ResultCode.Success;
-        }
-
         [CommandCmif(300)] // 9.0.0+
         // GetSettingsPlatformRegion() -> u8
         public ResultCode GetSettingsPlatformRegion(ServiceCtx context)
         {
             PlatformRegion platformRegion = context.Device.System.State.DesiredRegionCode == (uint)RegionCode.China ? PlatformRegion.China : PlatformRegion.Global;
-            
+
             // FIXME: Call set:sys GetPlatformRegion
             context.ResponseData.Write((byte)platformRegion);
 
             return ResultCode.Success;
         }
 
-        [CommandCmif(610)] // 21.0.0+
-        // UnknownCommand610(long unknown)
-        public ResultCode UnknownCommand610(ServiceCtx context)
-        {
-            long unknown = context.RequestData.ReadInt64();
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { unknown });
-            return ResultCode.Success;
-        }
-
         [CommandCmif(900)] // 11.0.0+
         // SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled()
         public ResultCode SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(ServiceCtx context)
@@ -397,100 +320,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
             return ResultCode.Success;
         }
 
-        [CommandCmif(1000)] // 19.0.0+
-        // BeginVrMode3d()
-        public ResultCode BeginVrMode3d(ServiceCtx context)
-        {
-            // NOTE: Service also applies a stereo scale to the goggle display, which we don't
-            //       model, so only the state is kept here.
-
-            _vrMode3dEnabled = true;
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1001)] // 19.0.0+
-        // EndVrMode3d()
-        public ResultCode EndVrMode3d(ServiceCtx context)
-        {
-            _vrMode3dEnabled = false;
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1002)] // 19.0.0+
-        // IsVrModeEnabled3d() -> b8
-        public ResultCode IsVrModeEnabled3d(ServiceCtx context)
-        {
-            context.ResponseData.Write(_vrMode3dEnabled);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1003)] // 21.0.0+
-        // GetVrLaboGoggleViewport() -> (s32 x, s32 y, s32 width, s32 height)
-        public ResultCode GetVrLaboGoggleViewport(ServiceCtx context)
-        {
-            if (!IsVrLaboGoggleSupportedTitle(context))
-            {
-                return ResultCode.ObjectInvalid;
-            }
-            
-            int VrDisplayCoordinateX = 0;
-            int VrDisplayCoordinateY = 0;
-            int VrDisplayWidth = _resolutionWidth;
-            int VrDisplayHeight = _resolutionHeight;
-
-            context.ResponseData.Write(VrDisplayCoordinateX);
-            context.ResponseData.Write(VrDisplayCoordinateY);
-            context.ResponseData.Write(VrDisplayWidth);
-            context.ResponseData.Write(VrDisplayHeight);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1004)] // 21.0.0+
-        // GetPanelPhysicalSizeForSpecificTitle() -> (f32 width, f32 height)
-        public ResultCode GetPanelPhysicalSizeForSpecificTitle(ServiceCtx context)
-        {
-            if (!IsVrLaboGoggleSupportedTitle(context))
-            {
-                return ResultCode.ObjectInvalid;
-            }
-            
-            // The switch provides micrometres, but the command reports millimetres.
-            // 6.2 inch 16:9 panel.
-            float PanelPhysicalWidthMicroMeters = 137250f;
-            float PanelPhysicalHeightMicroMeters = 77200f;
-            
-            context.ResponseData.Write(PanelPhysicalWidthMicroMeters / 1000f);
-            context.ResponseData.Write(PanelPhysicalHeightMicroMeters / 1000f);
-
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(1005)] // 21.0.0+
-        // GetPanelResolutionForSpecificTitle() -> (s32 width, s32 height)
-        public ResultCode GetPanelResolutionForSpecificTitle(ServiceCtx context)
-        {
-            if (!IsVrLaboGoggleSupportedTitle(context))
-            {
-                return ResultCode.ObjectInvalid;
-            }
-            
-            context.ResponseData.Write(_resolutionWidth);
-            context.ResponseData.Write(_resolutionHeight);
-
-            return ResultCode.Success;
-        }
-
-        private static bool IsVrLaboGoggleSupportedTitle(ServiceCtx context)
-        {
-            ulong programId = context.Device.Processes.ActiveApplication.ProgramId;
-
-            return _supportedVRGoggleTitles.Contains(programId);
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             if (isDisposing)

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILockAccessor.cs

@@ -1,80 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-using Ryujinx.Horizon.Common;
-using System;
-
-namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.SystemAppletProxy
-{
-    class ILockAccessor : IpcService
-    {
-        private readonly ServiceCtx _context;
-
-        private readonly Apm.ManagerServer _apmManagerServer;
-        private readonly Apm.SystemManagerServer _apmSystemManagerServer;
-        
-        private readonly KEvent _lockEvent;
-        private int _lockEventHandle;
-
-        public ILockAccessor(ServiceCtx context)
-        {
-            
-            _context = context;
-            
-            _apmManagerServer = new Apm.ManagerServer(context);
-            _apmSystemManagerServer = new Apm.SystemManagerServer(context);
-
-            _lockEvent = new KEvent(context.Device.System.KernelContext);
-        }
-
-        [CommandCmif(1)]
-        // TryLock(unknown u8 bool) -> unknown u8 bool
-        public ResultCode TryLock(ServiceCtx context)
-        {
-            // Official sw only uses inflag=false.
-            // Official sw just closes the output handle.
-            // The input flag controls whether this returns the output handle. 
-            bool unknown = context.RequestData.ReadBoolean();
-            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { unknown });
-            
-            context.ResponseData.Write(false);
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_lockEventHandle);
-            
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(2)]
-        // Unlock()
-        public ResultCode Unlock(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceAm);
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(3)]
-        // GetEvent() -> EventHandle w/ autoclear = false
-        public ResultCode GetEvent(ServiceCtx context)
-        {
-            if (_lockEventHandle == 0)
-            {
-                if (context.Process.HandleTable.GenerateHandle(_lockEvent.ReadableEvent, out _lockEventHandle) != Result.Success)
-                {
-                    throw new InvalidOperationException("Out of handles!");
-                }
-            }
-            
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_lockEventHandle);
-            Logger.Stub?.PrintStub(LogClass.ServiceAm);
-            return ResultCode.Success;
-        }
-
-        [CommandCmif(4)] // 10.0.0+
-        // IsLocked() -> unknown u8 bool
-        public ResultCode IsLocked(ServiceCtx context)
-        {
-            Logger.Stub?.PrintStub(LogClass.ServiceAm);
-            context.ResponseData.Write(false);
-            return ResultCode.Success;
-        }
-    }
-}

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/Types/AppletMessage.cs

@@ -32,6 +32,5 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
         DetectShortPressingCaptureButton = 90,
         AlbumScreenShotTaken = 92,
         AlbumRecordingSaved = 93,
-        StartupLogoDisappeared = 95, // 21.0.0+
     }
 }

src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         private readonly bool[] _supportedPlayers;
         private VibrationValue _neutralVibrationValue = new()
         {
-            AmplitudeLow = 0.01f,
+            AmplitudeLow = 0f,
             FrequencyLow = 160f,
             AmplitudeHigh = 0f,
             FrequencyHigh = 320f,

src/Ryujinx.HLE/Loaders/Processes/ProcessLoaderHelper.cs

@@ -182,10 +182,8 @@ namespace Ryujinx.HLE.Loaders.Processes
             ArmProcessContextFactory processContextFactory = new(
                 context.Device.System.TickSource,
                 context.Device.Gpu,
-                kip.ProgramId,
-                0,
-                kip.Version.ToString(),
-                ProcessResult.GetProcessKind(kip.ProgramId),
+                string.Empty,
+                string.Empty,
                 false,
                 null,
                 codeAddress,
@@ -379,10 +377,8 @@ namespace Ryujinx.HLE.Loaders.Processes
             ArmProcessContextFactory processContextFactory = new(
                 context.Device.System.TickSource,
                 context.Device.Gpu,
-                programId,
-                programIndex,
+                $"{programId:x16}",
                 displayVersion,
-                ProcessResult.GetProcessKind(programId),
                 diskCacheEnabled,
                 diskCacheSelector,
                 codeStart,

src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs

@@ -87,7 +87,7 @@ namespace Ryujinx.HLE.Loaders.Processes
             AllowCodeMemoryForJit = allowCodeMemoryForJit;
         }
 
-        internal static ProcessKind GetProcessKind(ulong programId)
+        private static ProcessKind GetProcessKind(ulong programId)
         {
             if (programId == 0)
             {

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -59,7 +59,6 @@
     <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" />
     <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" />
     <EmbeddedResource Include="HOS\Services\Account\Acc\DefaultUserImage.jpg" />
-    <EmbeddedResource Include="HOS\Services\Account\Acc\GuestUserImage.jpg" />
   </ItemGroup>
 
 </Project>

src/Ryujinx.HLE/UI/IHostUIHandler.cs

@@ -1,5 +1,4 @@
 using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 
 namespace Ryujinx.HLE.UI
@@ -49,8 +48,7 @@ namespace Ryujinx.HLE.UI
         /// Displays a Message Dialog box specific to Error Applet and blocks until it is closed.
         /// </summary>
         /// <returns>False when OK is pressed, True when another button (Details) is pressed.</returns>
-        // ReSharper disable once UnusedParameter.Global
-        bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText, (uint Module, uint Description)? errorCode = null);
+        bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText);
 
         /// <summary>
         /// Creates a handler to process keyboard inputs into text strings.
@@ -67,10 +65,5 @@ namespace Ryujinx.HLE.UI
         /// Takes a screenshot from the current renderer and saves it in the screenshots folder.
         /// </summary>
         void TakeScreenshot();
-
-        /// <summary>
-        /// Displays the player select dialog and returns the selected profile.
-        /// </summary>
-        UserProfile ShowPlayerSelectDialog();
     }
 }

src/Ryujinx.Input.SDL3/NpadHdRumble.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Hid;
 using SDL;
 using static SDL.SDL3;
@@ -13,276 +12,140 @@ namespace Ryujinx.Input.SDL3
     {
         private readonly SDL_hid_device* _hidHandle;
 
-        private byte[] _buffer;
-        private static ushort _vendor;
-        private static ushort _product;
-        
         private int _globalCount;
-        private ulong _lastWriteTicks;
 
         private NpadHdRumble(SDL_hid_device* hidHandle)
         {
             _hidHandle = hidHandle;
-            InitializeDevice();
         }
 
         public static NpadHdRumble Create(SDL_Gamepad* gamepadHandle)
         {
-            _vendor = SDL_GetGamepadVendor(gamepadHandle);
-            if (!Enum.IsDefined(typeof(HDRumbleSupportedVendor), _vendor))
+            ushort vendor = SDL_GetGamepadVendor(gamepadHandle);
+            if (vendor != 0x057e)
             {
                 return null;
             }
 
-            _product = SDL_GetGamepadProduct(gamepadHandle);
-            if (!Enum.IsDefined(typeof(HDRumbleSupportedProduct), _product))
+            ushort product = SDL_GetGamepadProduct(gamepadHandle);
+            if (product != 0x2006 && product != 0x2007 && product != 0x2009 && product != 0x200e)
             {
                 return null;
             }
 
-            int serialNumber = 0;
-            string? serial = SDL_GetGamepadSerial(gamepadHandle);
-            if (serial is not null)
-            {
-                int.TryParse(serial, out serialNumber);
-            }
-            
-            return new NpadHdRumble(SDL_hid_open(_vendor, _product, serialNumber));
+            return new NpadHdRumble(SDL_hid_open(vendor, product, 0));
         }
 
         // Some of the code was translated from https://github.com/MIZUSHIKI/JoyShockLibrary-plus-HDRumble
-        private bool WriteNintendoHdRumble(VibrationValue left, VibrationValue right)
+        private void WriteHdRumble(
+            int encLeftLowFreq, int encLeftLowAmp,
+            int encLeftHighFreq, int encLeftHighAmp,
+            int encRightLowFreq, int encRightLowAmp,
+            int encRightHighFreq, int encRightHighAmp)
         {
-            int leftLowAmp = EncodeLowAmp(left.AmplitudeLow);
-            int leftLowFreq = EncodeLowFreq(left.FrequencyLow) + (leftLowAmp >> 8);
-            int leftHighFreq = EncodeHighFreq(left.FrequencyHigh);
-            int leftHighAmp = EncodeHighAmp(left.AmplitudeHigh) + (leftHighFreq >> 8);
-                
-            int rightLowAmp = EncodeLowAmp(right.AmplitudeLow);
-            int rightLowFreq = EncodeLowFreq(right.FrequencyLow) + (rightLowAmp >> 8);
-            int rightHighFreq = EncodeHighFreq(right.FrequencyHigh);
-            int rightHighAmp = EncodeHighAmp(right.AmplitudeHigh) + (rightHighFreq >> 8);
-            
-            _buffer[0] = 0x10;
-            _buffer[1] = (byte)((_globalCount++) & 0xF);
-            
-            // Left LRA
-            _buffer[2] = (byte)(leftLowFreq & 0xFF);
-            _buffer[3] = (byte)(leftHighAmp & 0xFF);
-            _buffer[4] = (byte)(leftHighFreq & 0xFF);
-            _buffer[5] = (byte)(leftLowAmp & 0xFF);
-            
-            // Right LRA
-            _buffer[6] = (byte)(rightLowFreq & 0xFF);
-            _buffer[7] = (byte)(rightHighAmp & 0xFF);
-            _buffer[8] = (byte)(rightHighFreq & 0xFF);
-            _buffer[9] = (byte)(rightLowAmp & 0xFF);
-            
+            byte[] buf = new byte[10];
+
+            buf[0] = 0x10;
+            buf[1] = (byte)((++_globalCount) & 0xF);
+
+            buf[2] = (byte)(encLeftHighFreq & 0xFF);
+            buf[3] = (byte)(encLeftHighAmp + ((encLeftHighFreq >> 8) & 0xFF));
+            buf[4] = (byte)(encLeftLowFreq + ((encLeftLowAmp >> 8) & 0xFF));
+            buf[5] = (byte)(encLeftLowAmp & 0xFF);
+
+            buf[6] = (byte)(encRightHighFreq & 0xFF);
+            buf[7] = (byte)(encRightHighAmp + ((encRightHighFreq >> 8) & 0xFF));
+            buf[8] = (byte)(encRightLowFreq + ((encRightLowAmp >> 8) & 0xFF));
+            buf[9] = (byte)(encRightLowAmp & 0xFF);
+
             if (_globalCount > 0xF)
             {
                 _globalCount = 0x0;
             }
-            
-            fixed (byte* ptr = _buffer)
+
+            fixed (byte* ptr = buf)
             {
-                if (SendHdRumble(ptr, (nuint)_buffer.Length) >= 0)
-                {
-                    return true;
-                }
-                
-                Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
-                SDL_ClearError();
+                SDL_hid_write(_hidHandle, ptr, (nuint)buf.Length);
             }
-            
-            return false;
         }
 
+
         private static int EncodeLowFreq(float lowFreq)
         {
-            return (int)Math.Clamp(32 * Math.Log2(lowFreq * 0.1f) - 0x40, 81.75177f, 1252.572266f);
+            float lf = Math.Clamp(lowFreq, 40.875885f, 626.286133f);
+            return (int)Math.Round(32 * Math.Log2(lf * 0.1f)) - 0x40;
         }
 
         private static int EncodeHighFreq(float highFreq)
         {
-            return (int)Math.Clamp(32 * Math.Log2(highFreq * 0.1f) - 0x60, 81.75177f, 1252.572266f);
+            float hf = Math.Clamp(highFreq, 81.75177f, 1252.572266f);
+            return ((int)Math.Round(32 * Math.Log2(hf * 0.1f)) - 0x60) * 4;
         }
 
         private static int EncodeLowAmp(float rawAmp)
         {
-            double encodedAmp = 0;
+            int encodedAmp = 0;
 
             if (rawAmp is > 0 and < 0.012f)
+            {
                 encodedAmp = 1;
-            
+            }
             else if (rawAmp is >= 0.012f and < 0.112f)
-                encodedAmp = 4 * Math.Log2(rawAmp * 110f);
-            
+            {
+                encodedAmp = (int)Math.Round(4 * Math.Log2(rawAmp * 110f));
+            }
             else if (rawAmp is >= 0.112f and < 0.225f)
-                encodedAmp = 16 * Math.Log2(rawAmp * 17f);
-            
+            {
+                encodedAmp = (int)Math.Round(16 * Math.Log2(rawAmp * 17f));
+            }
             else if (rawAmp is >= 0.225f and <= 1f)
-                encodedAmp = 32 * Math.Log2(rawAmp * 8.7f);
-            
-            encodedAmp = Math.Round((encodedAmp / 2.0) + 64.0);
-            encodedAmp = Math.Clamp(encodedAmp, 0.0, 100.2867);
-            return (int)Math.Round(encodedAmp);
+            {
+                encodedAmp = (int)Math.Round(32 * Math.Log2(rawAmp * 8.7f));
+            }
+
+            return (int)Math.Floor(encodedAmp / 2.0) + 64;
         }
 
         private static int EncodeHighAmp(float rawAmp)
         {
-            double encodedAmp = 0;
+            int encodedAmp = 0;
 
             if (rawAmp is > 0 and < 0.012f)
+            {
                 encodedAmp = 1;
-            
+            }
             else if (rawAmp is >= 0.012f and < 0.112f)
-                encodedAmp = 4 * Math.Log2(rawAmp * 110f);
-            
+            {
+                encodedAmp = (int)Math.Round(4 * Math.Log2(rawAmp * 110f));
+            }
             else if (rawAmp is >= 0.112f and < 0.225f)
-                encodedAmp = 16 * Math.Log2(rawAmp * 17f);
-            
+            {
+                encodedAmp = (int)Math.Round(16 * Math.Log2(rawAmp * 17f));
+            }
             else if (rawAmp is >= 0.225f and <= 1f)
-                encodedAmp = 32 * Math.Log2(rawAmp * 8.7f);
-            
-            encodedAmp = Math.Round(encodedAmp / 2.0);
-            encodedAmp = Math.Clamp(encodedAmp, 0.0, 100.2867);
-            return (int)encodedAmp;
+            {
+                encodedAmp = (int)Math.Round(32 * Math.Log2(rawAmp * 8.7f));
+            }
+
+            return encodedAmp * 2;
         }
 
         public bool HdRumble(VibrationValue left, VibrationValue right)
         {
-            if(_product is (ushort) HDRumbleSupportedProduct.ProController
-               or (ushort) HDRumbleSupportedProduct.JoyconLeft
-               or (ushort) HDRumbleSupportedProduct.JoyconRight
-               or (ushort) HDRumbleSupportedProduct.JoyconPair
-               or (ushort) HDRumbleSupportedProduct.JoyconGrip)
-            {
-                return WriteNintendoHdRumble(left, right);
-            }
-
-            return false;
-        }
-
-        private int SendHdRumble(byte* data, nuint length)
-        {
-            int result = 0;
-            ulong currentTicks = SDL_GetTicks();
-
-            // Ditch rumble if we haven't hit the poll-rate yet.
-            if ((currentTicks - _lastWriteTicks) <= GetPollRate())
-            {
-                return result;
-            }
-            
-            result = SDL_hid_write(_hidHandle, data, length);
-            if (result >= 0)
-            {
-                _lastWriteTicks = currentTicks;
-            }
-            
-            return result;
-        }
-
-        private void InitializeDevice()
-        {
-            if (_vendor is (ushort)HDRumbleSupportedVendor.Nintendo)
-            {
-                _buffer = new byte[10];
-                byte[] init = new byte[64];
-
-                // Pro Controller and Charge Grip
-                if (_product 
-                    is (ushort)HDRumbleSupportedProduct.ProController 
-                    or (ushort)HDRumbleSupportedProduct.JoyconGrip)
-                {
-                    SDL_LockJoysticks();
-                    fixed (byte* ptr = init)
-                    {
-                        init[0] = 0x80;
-                        init[1] = 0x05; // Allow bluetooth timeout TODO: use 0x04 to force USB only (toggle?)
-                        SDL_hid_write(_hidHandle, ptr, 64);
-                    }
-                    SDL_UnlockJoysticks();
-                
-                    return;
-                }
-            
-                // Joycons
-                if (_product 
-                    is (ushort)HDRumbleSupportedProduct.JoyconLeft 
-                    or (ushort)HDRumbleSupportedProduct.JoyconRight
-                    or (ushort)HDRumbleSupportedProduct.JoyconPair)
-                {
-                
-                    SDL_LockJoysticks();
-                    fixed (byte* ptr = init)
-                    {
-                        // we could write data to the controller here (see above)
-                    }
-                    SDL_UnlockJoysticks();
-                    
-                    return;
-                }
-            }
-        }
-        
-        private ulong GetPollRate()
-        {
-            ulong pollRate = 0;
-            if (_vendor is (ushort)HDRumbleSupportedVendor.Nintendo)
-            {
-                // https://docs.handheldlegend.com/s/progcc-3/doc/lag-comparison-aAR1mV3JLX
-                pollRate = (ulong) 16.67;
-                if (_product is (ushort)HDRumbleSupportedProduct.ProController
-                    && SDL_hid_get_device_info(_hidHandle)->bus_type == SDL_hid_bus_type.SDL_HID_API_BUS_USB)
-                {
-                    pollRate = (ulong) 8.33;
-                }
-            }
-            
-            return pollRate;
+            WriteHdRumble(EncodeLowFreq(left.FrequencyLow),
+                EncodeLowAmp(left.AmplitudeLow),
+                EncodeHighFreq(left.FrequencyHigh),
+                EncodeHighAmp(left.AmplitudeHigh),
+                EncodeLowFreq(right.FrequencyLow),
+                EncodeLowAmp(right.AmplitudeLow),
+                EncodeHighFreq(right.FrequencyHigh),
+                EncodeHighAmp(right.AmplitudeHigh));
+            return true;
         }
 
         public void Dispose()
         {
-            GC.SuppressFinalize(this);
             SDL_hid_close(_hidHandle);
         }
     }
-
-    public enum HDRumbleSupportedVendor : ushort
-    {
-        Nintendo = 0x057e,
-        Valve = 0x28de,
-        Sony = 0x054c
-    }
-
-    public enum HDRumbleSupportedProduct : ushort
-    {
-        // TODO: Currently, HD Rumble only supports the Pro Controller and JoyCons.
-        //       We need to initialize and report to each device differently.
-        
-        // Nintendo Switch: 0x057e
-        JoyconLeft = 0x2006,
-        JoyconRight = 0x2007,
-        JoyconPair = 0x2008,
-        ProController = 0x2009,
-        JoyconGrip = 0x200e,
-        
-        // Nintendo Switch 2: 0x057e
-        Joycon2Right = 0x2066,
-        Joycon2Left = 0x2067,
-        Joycon2Pair = 0x2068,
-        Switch2ProController = 0x2069,
-        GamecubeController = 0x2073,
-        
-        // Valve Steam Family: 0x28de
-        // https://github.com/libsdl-org/SDL/issues/9148
-        SteamDeck = 0x11ff,
-        SteamDeckVirtualDevice = 0x1205,
-        SteamController = 0x1106,
-        
-        // PlayStation Dualsense: 0x054c
-        Dualsense = 0x0ce6
-    }
 }

src/Ryujinx.Input.SDL3/SDL3Gamepad.cs

@@ -177,12 +177,10 @@ namespace Ryujinx.Input.SDL3
             return _hdRumble?.HdRumble(left, right) ?? false;
         }
 
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
         {
             if ((Features & GamepadFeaturesFlag.Rumble) == 0)
-            {
-                return false;
-            }
+                return;
 
             ushort lowFrequencyRaw = (ushort)(lowFrequency * ushort.MaxValue);
             ushort highFrequencyRaw = (ushort)(highFrequency * ushort.MaxValue);
@@ -201,15 +199,6 @@ namespace Ryujinx.Input.SDL3
                 if (!SDL_RumbleGamepad(_gamepadHandle, lowFrequencyRaw, highFrequencyRaw, durationMs))
                     Logger.Error?.Print(LogClass.Hid, "Rumble is not supported on this game controller.");
             }
-            
-            if (!String.IsNullOrEmpty(SDL_GetError()))
-            {
-                Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
-                SDL_ClearError();
-                return false;
-            }
-
-            return true;
         }
 
         public Vector3 GetMotionData(MotionInputId inputId)

src/Ryujinx.Input.SDL3/SDL3JoyCon.cs

@@ -163,7 +163,7 @@ namespace Ryujinx.Input.SDL3
 
         public void SetTriggerThreshold(float triggerThreshold)
         {
-            // No operations
+
         }
         
         public bool HDRumble(VibrationValue left, VibrationValue right)
@@ -171,12 +171,10 @@ namespace Ryujinx.Input.SDL3
             return _hdRumble?.HdRumble(left, right) ?? false;
         }
 
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
         {
             if ((Features & GamepadFeaturesFlag.Rumble) == 0)
-            {
-                return false;
-            }
+                return;
 
             ushort lowFrequencyRaw = (ushort)(lowFrequency * ushort.MaxValue);
             ushort highFrequencyRaw = (ushort)(highFrequency * ushort.MaxValue);
@@ -195,15 +193,6 @@ namespace Ryujinx.Input.SDL3
                 if (!SDL_RumbleGamepad(_gamepadHandle, lowFrequencyRaw, highFrequencyRaw, durationMs))
                     Logger.Error?.Print(LogClass.Hid, "Rumble is not supported on this game controller.");
             }
-            
-            if (!String.IsNullOrEmpty(SDL_GetError()))
-            {
-                Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
-                SDL_ClearError();
-                return false;
-            }
-
-            return true;
         }
 
         public Vector3 GetMotionData(MotionInputId inputId)

src/Ryujinx.Input.SDL3/SDL3JoyConPair.cs

@@ -1,7 +1,4 @@
-using Gommon;
-using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Services.Hid;
+using Ryujinx.Common.Configuration.Hid;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -64,14 +61,7 @@ namespace Ryujinx.Input.SDL3
             return left.IsPressed(inputId) || right.IsPressed(inputId);
         }
 
-        public bool HDRumble(VibrationValue left, VibrationValue right)
-        {
-            // return _hdRumble?.HdRumble(left, right) ?? false;
-            // TODO: Track rumble and motion on both controllers
-            return false;
-        }
-
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
         {
             if (lowFrequency != 0)
             {
@@ -88,15 +78,6 @@ namespace Ryujinx.Input.SDL3
                 left.Rumble(0, 0, durationMs);
                 right.Rumble(0, 0, durationMs);
             }
-
-            if (!SDL_GetError().IsNullOrEmpty())
-            {
-                Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
-                SDL_ClearError();
-                return false;
-            }
-
-            return true;
         }
 
         public void SetConfiguration(InputConfig configuration)

src/Ryujinx.Input.SDL3/SDL3Keyboard.cs

@@ -1,7 +1,6 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using SDL;
-using Ryujinx.HLE.HOS.Services.Hid;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -386,14 +385,9 @@ namespace Ryujinx.Input.SDL3
             // No operations
         }
 
-        public bool HDRumble(VibrationValue left, VibrationValue right)
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
         {
-            return false;
-        }
-        
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            return false;
+            // No operations
         }
 
         public Vector3 GetMotionData(MotionInputId inputId)

src/Ryujinx.Input.SDL3/SDL3Mouse.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.HLE.HOS.Services.Hid;
 using System;
 using System.Drawing;
 using System.Numerics;
@@ -67,12 +66,7 @@ namespace Ryujinx.Input.SDL3
             throw new NotImplementedException();
         }
 
-        public bool HDRumble(VibrationValue left, VibrationValue right)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
         {
             throw new NotImplementedException();
         }

src/Ryujinx.Input/HLE/NpadController.cs

@@ -554,38 +554,34 @@ namespace Ryujinx.Input.HLE
         {
             if (queue.TryDequeue(out (VibrationValue, VibrationValue) dualVibrationValue))
             {
-                if (_config is not StandardControllerInputConfig controllerConfig ||
-                    !controllerConfig.Rumble.EnableRumble)
+                if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Rumble.EnableRumble)
                 {
-                    return;
+                    VibrationValue leftVibrationValue = dualVibrationValue.Item1;
+                    VibrationValue rightVibrationValue = dualVibrationValue.Item2;
+                    
+                    float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15) * controllerConfig.Rumble.StrongRumble));
+                    float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85) * controllerConfig.Rumble.WeakRumble));
+                    
+                    leftVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
+                    leftVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
+                    rightVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
+                    rightVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
+
+                    if (_gamepad?.HDRumble(leftVibrationValue, rightVibrationValue) == false)
+                    {
+                        _gamepad.Rumble(low, high, uint.MaxValue);
+                    }
+
+                    Logger.Debug?.Print(LogClass.Hid, $"Effect for {controllerConfig.PlayerIndex} " +
+                        $"L.low.amp={leftVibrationValue.AmplitudeLow}, " +
+                        $"L.high.amp={leftVibrationValue.AmplitudeHigh}, " +
+                        $"L.low.freq={leftVibrationValue.FrequencyLow}, " +
+                        $"L.high.freq={leftVibrationValue.FrequencyHigh}, " +
+                        $"R.low.amp={rightVibrationValue.AmplitudeLow}, " +
+                        $"R.high.amp={rightVibrationValue.AmplitudeHigh} " +
+                        $"R.low.freq={rightVibrationValue.FrequencyLow}, " +
+                        $"R.high.freq={rightVibrationValue.FrequencyHigh}");
                 }
-
-                VibrationValue leftVibrationValue = dualVibrationValue.Item1;
-                VibrationValue rightVibrationValue = dualVibrationValue.Item2;
-
-                float low = Math.Min(1f, (float)((rightVibrationValue.AmplitudeLow * 0.85 + rightVibrationValue.AmplitudeHigh * 0.15)));
-                float high = Math.Min(1f, (float)((leftVibrationValue.AmplitudeLow * 0.15 + leftVibrationValue.AmplitudeHigh * 0.85)));
-
-                leftVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
-                leftVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
-                rightVibrationValue.AmplitudeLow *= controllerConfig.Rumble.WeakRumble;
-                rightVibrationValue.AmplitudeHigh *= controllerConfig.Rumble.StrongRumble;
-
-                if (!controllerConfig.Rumble.UseHDRumble || !_gamepad.HDRumble(leftVibrationValue, rightVibrationValue))
-                {
-                    _gamepad.Rumble(low, high, 0xFFFFFFFF);
-                }
-
-                Logger.Debug?.Print(LogClass.Hid, $"Effect for {controllerConfig.PlayerIndex} " + 
-                    // Value=value/multiplier * multiplier (result)
-                    $"L.low.amp={leftVibrationValue.AmplitudeLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.AmplitudeLow}), " +
-                    $"L.high.amp={leftVibrationValue.AmplitudeHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({leftVibrationValue.AmplitudeHigh}), " +
-                    $"L.low.freq={leftVibrationValue.FrequencyLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({leftVibrationValue.FrequencyLow}), " +
-                    $"L.high.freq={leftVibrationValue.FrequencyHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({leftVibrationValue.FrequencyHigh}), " +
-                    $"R.low.amp={rightVibrationValue.AmplitudeLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({rightVibrationValue.AmplitudeLow}), " +
-                    $"R.high.amp={rightVibrationValue.AmplitudeHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.AmplitudeHigh}), " +
-                    $"R.low.freq={rightVibrationValue.FrequencyLow / controllerConfig.Rumble.WeakRumble} * {controllerConfig.Rumble.WeakRumble} ({rightVibrationValue.FrequencyLow}), " +
-                    $"R.high.freq={rightVibrationValue.FrequencyHigh / controllerConfig.Rumble.StrongRumble} * {controllerConfig.Rumble.StrongRumble} ({rightVibrationValue.FrequencyHigh})");
             }
         }
     }

src/Ryujinx.Input/IGamepad.cs

@@ -71,7 +71,10 @@ namespace Ryujinx.Input
         /// </summary>
         /// <param name="left">The vibration data for the left side</param>
         /// <param name="right">The vibration data for the right side</param>
-        bool HDRumble(VibrationValue left, VibrationValue right);
+        bool HDRumble(VibrationValue left, VibrationValue right)
+        {
+            return false;
+        }
 
         /// <summary>
         /// Starts a rumble effect on the gamepad.
@@ -79,10 +82,10 @@ namespace Ryujinx.Input
         /// <param name="lowFrequency">The intensity of the low frequency from 0.0f to 1.0f</param>
         /// <param name="highFrequency">The intensity of the high frequency from 0.0f to 1.0f</param>
         /// <param name="durationMs">The duration of the rumble effect in milliseconds.</param>
-        bool Rumble(float lowFrequency, float highFrequency, uint durationMs);
+        void Rumble(float lowFrequency, float highFrequency, uint durationMs);
 
         /// <summary>
-        /// Get a snaphost of the state of the gamepad that is remapped with the information from the <see cref="InputConfig"/> set via <see cref="SetConfiguration(InputConfig)"/>.
+        /// Get a snaphost of the state of the gamepad that is remapped with the informations from the <see cref="InputConfig"/> set via <see cref="SetConfiguration(InputConfig)"/>.
         /// </summary>
         /// <returns>A remapped snaphost of the state of the gamepad.</returns>
         GamepadStateSnapshot GetMappedStateSnapshot();

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -1422,7 +1422,6 @@ namespace Ryujinx.UI.Common.Configuration
                             EnableRumble = false,
                             StrongRumble = 1f,
                             WeakRumble = 1f,
-                            UseHDRumble = false
                         };
                     }
                 }

src/Ryujinx.UI.Common/Helper/CommandLineState.cs

@@ -15,9 +15,6 @@ namespace Ryujinx.UI.Common.Helper
         public static string OverrideBackendThreading { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
-
-        public static string RenderDocCaptureTitleFormat { get; private set; } =
-            "{EmuVersion}\n{GuestName} {GuestVersion} {GuestTitleId} {GuestArch}";
         public static FilePath FirmwareToInstallPathArg { get; set; }
         public static string Profile { get; private set; }
         public static string LaunchPathArg { get; private set; }
@@ -48,20 +45,6 @@ namespace Ryujinx.UI.Common.Helper
 
                         BaseDirPathArg = args[++i];
 
-                        arguments.Add(arg);
-                        arguments.Add(args[i]);
-                        break;
-                    case "-rdct":
-                    case "--rd-capture-title-format":
-                        if (i + 1 >= args.Length)
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
-
-                            continue;
-                        }
-
-                        RenderDocCaptureTitleFormat = args[++i];
-
                         arguments.Add(arg);
                         arguments.Add(args[i]);
                         break;

src/Ryujinx.UI.Common/Helper/TitleHelper.cs

@@ -1,4 +1,3 @@
-using Gommon;
 using Ryujinx.HLE.Loaders.Processes;
 using System;
 
@@ -27,23 +26,5 @@ namespace Ryujinx.UI.Common.Helper
 
             return appTitle;
         }
-
-        public static string FormatRenderDocCaptureTitle(ProcessResult activeProcess, string applicationVersion)
-        {
-            if (activeProcess == null)
-                return string.Empty;
-
-            string titleNameSection = string.IsNullOrWhiteSpace(activeProcess.Name) ? string.Empty : activeProcess.Name;
-            string titleVersionSection = string.IsNullOrWhiteSpace(activeProcess.DisplayVersion) ? string.Empty : $"v{activeProcess.DisplayVersion}";
-            string titleIdSection = $"({activeProcess.ProgramIdText.ToUpper()})";
-            string titleArchSection = activeProcess.Is64Bit ? "(64-bit)" : "(32-bit)";
-
-            return CommandLineState.RenderDocCaptureTitleFormat
-                .ReplaceIgnoreCase("{EmuVersion}", applicationVersion)
-                .ReplaceIgnoreCase("{GuestName}", titleNameSection)
-                .ReplaceIgnoreCase("{GuestVersion}", titleVersionSection)
-                .ReplaceIgnoreCase("{GuestTitleId}", titleIdSection)
-                .ReplaceIgnoreCase("{GuestArch}", titleArchSection);
-        }
     }
 }

src/Ryujinx/App.axaml.cs

@@ -14,7 +14,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.RenderDocApi;
 using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
 using System;

src/Ryujinx/AppHost.cs

@@ -45,7 +45,6 @@ using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
 using Silk.NET.Vulkan;
 using SkiaSharp;
-using SPB.Graphics.Exceptions;
 using SPB.Graphics.Vulkan;
 using System;
 using System.Collections.Generic;
@@ -655,22 +654,8 @@ namespace Ryujinx.Ava
 
             if (RendererHost.EmbeddedWindow is EmbeddedWindowOpenGL openGlWindow)
             {
-                try
-                {
-                    // Try to bind the OpenGL context before disposing GPU resources.
-                    openGlWindow.MakeCurrent();
-                }
-                catch (ContextException e) when (_userChannelPersistence.ShouldRestart)
-                {
-                    // ExecuteProgram may detach the old native window before GPU
-                    // disposal. Allow the old context to be released with the window
-                    // and continue the requested program relaunch.
-                    Logger.Warning?.Print(
-                        LogClass.UI,
-                        $"Failed to bind OpenGL context during program relaunch: {e}");
-
-                    return;
-                }
+                // Try to bind the OpenGL context before calling the shutdown event.
+                openGlWindow.MakeCurrent(false, false);
 
                 Device.DisposeGpu();
 
@@ -1090,10 +1075,9 @@ namespace Ryujinx.Ava
         {
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                if (_viewModel.StartGamesInFullscreen && _viewModel.WindowState is not WindowState.FullScreen)
+                if (_viewModel.StartGamesInFullscreen)
                 {
-                    // Use the view model toggle so decoration ordering matches user toggles.
-                    _viewModel.ToggleFullscreen();
+                    _viewModel.WindowState = WindowState.FullScreen;
                 }
 
                 if (_viewModel.WindowState == WindowState.FullScreen || _viewModel.StartGamesWithoutUI)

src/Ryujinx/Assets/Locales/en_US.json

@@ -462,8 +462,6 @@
   "ControllerSettingsRumble": "Rumble",
   "ControllerSettingsRumbleStrongMultiplier": "Strong Rumble Multiplier",
   "ControllerSettingsRumbleWeakMultiplier": "Weak Rumble Multiplier",
-  "ControllerSettingsRumbleUseHDRumble": "Enable HD Rumble",
-  "HDRumbleTooltip": "EXPERIMENTAL.\n\nSends more data to the controller for better rumble.\n\nCurrently only supports first-party Nintendo Switch controllers.\n\nLeave OFF if unsure.",
   "DialogMessageSaveNotAvailableMessage": "There is no savedata for {0} [{1:x16}]",
   "DialogMessageSaveNotAvailableCreateSaveMessage": "Would you like to create savedata for this game?",
   "DialogConfirmationTitle": "Ryujinx - Confirmation",
@@ -934,9 +932,5 @@
   "GameListContextMenuExtractDataAocRomFSToolTip": "Extract the RomFS from a selected DLC file",
   "ExtractAocListHeader": "Select a DLC to Extract",
   "SettingsTabSystemSkipUserProfilesManager": "Skip Dialog 'Manage User Profiles'",
-  "SkipUserProfilesTooltip": "This option skips the 'Manage User Profiles' dialog during gameplay, using a pre-selected profile.\n\nProfile switching is found in 'Settings' - 'Manager User Profiles'. Select the desired profile before loading the game.",
-  "MenuBarActions_StartCapture": "Start RenderDoc Frame Capture",
-  "MenuBarActions_EndCapture": "End RenderDoc Frame Capture",
-  "MenuBarActions_DiscardCapture": "Discard RenderDoc Frame Capture",
-  "MenuBarActions_DiscardCapture_ToolTip": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result."
+  "SkipUserProfilesTooltip": "This option skips the 'Manage User Profiles' dialog during gameplay, using a pre-selected profile.\n\nProfile switching is found in 'Settings' - 'Manager User Profiles'. Select the desired profile before loading the game."
 }

src/Ryujinx/Assets/Locales/es_ES.json

@@ -807,9 +807,5 @@
   "MultiplayerModeDisabled": "Deshabilitar",
   "MultiplayerModeLdnMitm": "ldn_mitm",
   "SettingsTabSystemSkipUserProfilesManager": "Omitir el Diálogo 'Gestionar Perfiles de Usuario'",
-  "SkipUserProfilesTooltip": "Esta opción omite el diálogo de 'Gestionar perfiles de usuario' durante el juego, utilizando un perfil preseleccionado.\n\nEl cambio de perfil se encuentra en 'Configuración' - 'Gestionar perfiles de usuario'. Seleccione el perfil deseado antes de cargar el juego.",
-  "MenuBarActions_StartCapture": "Iniciar una captura de fotograma de RenderDoc",
-  "MenuBarActions_EndCapture": "Detener la captura de fotograma de RenderDoc",
-  "MenuBarActions_DiscardCapture": "Descartar la captura de fotograma de RenderDoc",
-  "MenuBarActions_DiscardCapture_ToolTip": "Finaliza la captura de fotograma de RenderDoc actualmente activa y descarta inmediatamente su resultado."
+  "SkipUserProfilesTooltip": "Esta opción omite el diálogo de 'Gestionar perfiles de usuario' durante el juego, utilizando un perfil preseleccionado.\n\nEl cambio de perfil se encuentra en 'Configuración' - 'Gestionar perfiles de usuario'. Seleccione el perfil deseado antes de cargar el juego."
 }

src/Ryujinx/Assets/Locales/fr_FR.json

@@ -828,9 +828,5 @@
   "GameListContextMenuExtractDataAocRomFSToolTip": "Extraire les RomFS d'un fichier DLC choisi",
   "ExtractAocListHeader": "Choisissez un DLC à extraire",
   "SettingsTabSystemSkipUserProfilesManager": "Ignorer la Boîte de Dialogue « Gérer les Profils d'Utilisateurs »",
-  "SkipUserProfilesTooltip": "Cette option permet d'éviter le dialogue du 'Gérer les profils d'utilisateurs' pendant le jeu, en utilisant un profil pré-sélectionné.\n\nLa sélection du profil se trouve dans 'Paramètres' - 'Gérer les profils d'utilisateurs'. Sélectionnez le profil souhaité avant de charger la partie.",
-  "MenuBarActions_StartCapture": "Démarrer une capture de trame RenderDoc",
-  "MenuBarActions_EndCapture": "Arrêter la capture de trame RenderDoc",
-  "MenuBarActions_DiscardCapture": "Supprimer la capture de trame RenderDoc",
-  "MenuBarActions_DiscardCapture_ToolTip": "Met fin à la capture de trame RenderDoc en cours, en supprimant immédiatement son résultat."
+  "SkipUserProfilesTooltip": "Cette option permet d'éviter le dialogue du 'Gérer les profils d'utilisateurs' pendant le jeu, en utilisant un profil pré-sélectionné.\n\nLa sélection du profil se trouve dans 'Paramètres' - 'Gérer les profils d'utilisateurs'. Sélectionnez le profil souhaité avant de charger la partie."
 }

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -223,7 +223,6 @@ namespace Ryujinx.Headless
                             StrongRumble = 1f,
                             WeakRumble = 1f,
                             EnableRumble = false,
-                            UseHDRumble = true
                         },
                     };
                 }

src/Ryujinx/Headless/WindowBase.cs

@@ -10,7 +10,6 @@ using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.HLE.UI;
@@ -29,7 +28,6 @@ using static SDL.SDL3;
 using AntiAliasing = Ryujinx.Common.Configuration.AntiAliasing;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Switch = Ryujinx.HLE.Switch;
-using UserProfile = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
 
 namespace Ryujinx.Headless
 {
@@ -533,7 +531,7 @@ namespace Ryujinx.Headless
             Exit();
         }
 
-        public bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText, (uint Module, uint Description)? errorCode = null)
+        public bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText)
         {
             SDL_MessageBoxButtonData[] buttons = new SDL_MessageBoxButtonData[buttonsText.Length];
 
@@ -592,10 +590,5 @@ namespace Ryujinx.Headless
         {
             throw new NotImplementedException();
         }
-        
-        public UserProfile ShowPlayerSelectDialog()
-        {
-            return AccountSaveDataManager.GetLastUsedUser();
-        }
     }
 }

src/Ryujinx/Input/AvaloniaKeyboard.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
-using Ryujinx.HLE.HOS.Services.Hid;
 using Ryujinx.Input;
 using System;
 using System.Collections.Generic;
@@ -150,20 +149,9 @@ namespace Ryujinx.Ava.Input
             }
         }
 
-        public void SetTriggerThreshold(float triggerThreshold)
-        {
-            // No operations
-        }
+        public void SetTriggerThreshold(float triggerThreshold) { }
 
-        public bool HDRumble(VibrationValue left, VibrationValue right)
-        {
-            return false;
-        }
-
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
-        {
-            return false;
-        }
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs) { }
 
         public Vector3 GetMotionData(MotionInputId inputId) => Vector3.Zero;
 

src/Ryujinx/Input/AvaloniaMouse.cs

@@ -1,5 +1,4 @@
 using Ryujinx.Common.Configuration.Hid;
-using Ryujinx.HLE.HOS.Services.Hid;
 using Ryujinx.Input;
 using System;
 using System.Drawing;
@@ -64,13 +63,8 @@ namespace Ryujinx.Ava.Input
         {
             throw new NotImplementedException();
         }
-        
-        public bool HDRumble(VibrationValue left, VibrationValue right)
-        {
-            throw new NotImplementedException();
-        }
 
-        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
         {
             throw new NotImplementedException();
         }

src/Ryujinx/Program.cs

@@ -8,7 +8,6 @@ using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Graphics.RenderDocApi;
 using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.Modules;

src/Ryujinx/Ryujinx.csproj

@@ -56,7 +56,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Graphics.RenderDocApi\Ryujinx.Graphics.RenderDocApi.csproj" />
     <ProjectReference Include="..\Ryujinx.Audio.Backends.SDL3\Ryujinx.Audio.Backends.SDL3.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj" />
@@ -169,10 +168,4 @@
   <ItemGroup>
     <TrimmerRootDescriptor Include="TrimmerRootDescriptor.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UI\Applet\UserSelectorDialog.axaml.cs">
-      <DependentUpon>UserSelectorDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
 </Project>

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -1,23 +1,17 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
-using Gommon;
 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;
-using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using Ryujinx.UI.Common.Configuration;
 using System;
-using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading;
 
 namespace Ryujinx.Ava.UI.Applet
@@ -221,7 +215,7 @@ namespace Ryujinx.Ava.UI.Applet
             _parent.ViewModel.AppHost?.Stop();
         }
 
-        public bool DisplayErrorAppletDialog(string title, string message, string[] buttons, (uint Module, uint Description)? errorCode = null)
+        public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)
         {
             ManualResetEvent dialogCloseEvent = new(false);
 
@@ -262,61 +256,11 @@ namespace Ryujinx.Ava.UI.Applet
             return showDetails;
         }
 
-        public IDynamicTextInputHandler CreateDynamicTextInputHandler() => new AvaloniaDynamicTextInputHandler(_parent);
-        
-        public UserProfile ShowPlayerSelectDialog()
+        public IDynamicTextInputHandler CreateDynamicTextInputHandler()
         {
-            UserId selected = UserId.Null;
-            byte[] defaultGuestImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg");
-            UserProfile guest = new UserProfile(new UserId("00000000000000000000000000000080"), "Guest", defaultGuestImage);
-    
-            ManualResetEvent dialogCloseEvent = new(false);
-    
-            Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                ObservableCollection<BaseModel> profiles = [];
-                NavigationDialogHost nav = new();
-                
-                _parent.AccountManager.GetAllUsers()
-                    .OrderBy(x => x.Name)
-                    .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
-                
-                profiles.Add(new Models.UserProfile(guest, nav));
-                ProfileSelectorDialogViewModel viewModel = new()
-                {
-                    Profiles = profiles,
-                    SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
-                };
-                (selected, _) = await ProfileSelectorDialog.ShowInputDialog(viewModel);
-        
-                dialogCloseEvent.Set();
-            });
-    
-            dialogCloseEvent.WaitOne();
-            
-            UserProfile profile = _parent.AccountManager.LastOpenedUser;
-            if (selected == guest.UserId)
-            {
-                profile = guest;
-            }
-            else if (selected == UserId.Null)
-            {
-                profile = null;
-            }
-            else
-            {
-                foreach (UserProfile p in _parent.AccountManager.GetAllUsers())
-                {
-                    if (p.UserId == selected)
-                    {
-                        profile = p;
-                        break;
-                    }
-                }
-            }
-            return profile;
+            return new AvaloniaDynamicTextInputHandler(_parent);
         }
-
+        
         public void TakeScreenshot()
         {
             _parent.ViewModel.AppHost.ScreenshotRequested = true;

src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml

@@ -1,121 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Applet.ProfileSelectorDialog"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    d:DesignHeight="450"
-    MinWidth="500"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
-    Focusable="True"
-    x:DataType="viewModels:ProfileSelectorDialogViewModel">
-    
-    <UserControl.Resources>
-        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-    </UserControl.Resources>
-    
-    <Design.DataContext>
-        <viewModels:ProfileSelectorDialogViewModel />
-    </Design.DataContext>
-    
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        
-        <Border
-            CornerRadius="5"
-            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
-            BorderThickness="1">
-            
-            <ListBox
-                MaxHeight="300"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                ItemsSource="{Binding Profiles}"
-                SelectionChanged="ProfilesList_SelectionChanged">
-                
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <WrapPanel
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
-                
-                <ListBox.Styles>
-                    <Style Selector="ListBoxItem">
-                        <Setter Property="Margin" Value="5 5 0 5" />
-                        <Setter Property="CornerRadius" Value="5" />
-                    </Style>
-                    <Style Selector="Rectangle#SelectionIndicator">
-                        <Setter Property="Opacity" Value="0" />
-                    </Style>
-                </ListBox.Styles>
-                
-                <ListBox.DataTemplates>
-                    <DataTemplate
-                        DataType="models:UserProfile">
-                        <Grid
-                            PointerEntered="Grid_PointerEntered"
-                            PointerExited="Grid_OnPointerExited">
-                            <Border
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                ClipToBounds="True"
-                                CornerRadius="5"
-                                Background="{Binding BackgroundColor}">
-                                <StackPanel
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch">
-                                    <Image
-                                        Width="96"
-                                        Height="96"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Top"
-                                        Source="{Binding Image, Converter={StaticResource ByteImage}}" />
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        MaxWidth="90"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap"
-                                        TextTrimming="CharacterEllipsis"
-                                        MaxLines="2"
-                                        Margin="5" />
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </DataTemplate>
-                    <DataTemplate
-                        DataType="viewModels:BaseModel">
-                        <Panel
-                            Height="118"
-                            Width="96">
-                            <Panel.Styles>
-                                <Style Selector="Panel">
-                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                                </Style>
-                            </Panel.Styles>
-                        </Panel>
-                    </DataTemplate>
-                </ListBox.DataTemplates>
-            </ListBox>
-        </Border>
-        
-        <StackPanel
-            Grid.Row="1"
-            Margin="0 24 0 0"
-            HorizontalAlignment="Left"
-            Orientation="Horizontal"
-            Spacing="10">
-        </StackPanel>
-    </Grid>
-</UserControl>

src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs

@@ -1,125 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-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.Common.Logging;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using Ryujinx.UI.Common.Configuration;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
-using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
-
-namespace Ryujinx.Ava.UI.Applet
-{
-    public partial class ProfileSelectorDialog : UserControl
-    {
-        public ProfileSelectorDialogViewModel ViewModel { get; set; }
-
-        public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
-        {
-            DataContext = ViewModel = viewModel;
-            
-            InitializeComponent();
-        }
-        
-        private void Grid_PointerEntered(object sender, PointerEventArgs e)
-        {
-            if (sender is Grid { DataContext: UserProfile profile })
-            {
-                profile.IsPointerOver = true;
-            }
-        }
-
-        private void Grid_OnPointerExited(object sender, PointerEventArgs e)
-        {
-            if (sender is Grid { DataContext: UserProfile profile })
-            {
-                profile.IsPointerOver = false;
-            }
-        }
-
-        private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is ListBox listBox)
-            {
-                int selectedIndex = listBox.SelectedIndex;
-
-                if (selectedIndex >= 0 && selectedIndex < ViewModel.Profiles.Count)
-                {
-                    if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
-                    {
-                        ViewModel.SelectedUserId = userProfile.UserId;
-                        Logger.Info?.Print(LogClass.UI, $"Selected: {userProfile.UserId}", "ProfileSelector");
-
-                        ObservableCollection<BaseModel> newProfiles = [];
-
-                        foreach (BaseModel item in ViewModel.Profiles)
-                        {
-                            if (item is UserProfile originalItem)
-                            {
-                                UserProfileSft profile = new(originalItem.UserId, originalItem.Name, originalItem.Image);
-                                
-                                if (profile.UserId == ViewModel.SelectedUserId)
-                                {
-                                    profile.AccountState = AccountState.Open;
-                                }
-
-                                newProfiles.Add(new UserProfile(profile, new NavigationDialogHost()));
-                            }
-                        }
-
-                        ViewModel.Profiles = newProfiles;
-                    }
-                }
-            }
-        }
-
-        public static async Task<(UserId Id, bool Result)> ShowInputDialog(ProfileSelectorDialogViewModel viewModel)
-        {
-
-            if (ConfigurationState.Instance.System.SkipUserProfilesManager)
-            {
-                UserId defaultId = viewModel.SelectedUserId;
-                return (defaultId, true);
-            }
-
-            FAContentDialog contentDialog = new()
-            {
-                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
-                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
-                SecondaryButtonText = string.Empty,
-                CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
-                Content = new ProfileSelectorDialog(viewModel),
-                Padding = new Thickness(0)
-            };
-
-            UserId result = UserId.Null;
-            bool input = false;
-            
-            contentDialog.Closed += Handler;
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
-
-            return (result, input);
-            
-            void Handler(FAContentDialog sender, FAContentDialogClosedEventArgs eventArgs)
-            {
-                if (eventArgs.Result == FAContentDialogResult.Primary)
-                {
-                    result = viewModel.SelectedUserId;
-                    input = true;
-                }
-                else
-                {
-                    result = UserId.Null;
-                    input = false;
-                }
-            }
-        }
-    }
-}

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

@@ -19,7 +19,6 @@ namespace Ryujinx.Ava.UI.Models.Input
 
         public float WeakRumble { get; set; }
         public float StrongRumble { get; set; }
-        public bool UseHDRumble { get; set; }
 
         public string Id { get; set; }
         public ControllerType ControllerType { get; set; }
@@ -203,7 +202,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                     EnableRumble = controllerInput.Rumble.EnableRumble;
                     WeakRumble = controllerInput.Rumble.WeakRumble;
                     StrongRumble = controllerInput.Rumble.StrongRumble;
-                    UseHDRumble = controllerInput.Rumble.UseHDRumble;
                 }
             }
         }
@@ -261,7 +259,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                     EnableRumble = EnableRumble,
                     WeakRumble = WeakRumble,
                     StrongRumble = StrongRumble,
-                    UseHDRumble = UseHDRumble,
                 },
                 Version = InputConfig.CurrentVersion,
                 DeadzoneLeft = DeadzoneLeft,

src/Ryujinx/UI/Renderer/EmbeddedWindow.cs

@@ -4,9 +4,6 @@ using Avalonia.Platform;
 using Ryujinx.Common.Configuration;
 using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
-using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.RenderDocApi;
-using Ryujinx.HLE;
 using SPB.Graphics;
 using SPB.Platform;
 using SPB.Platform.GLX;
@@ -33,7 +30,6 @@ namespace Ryujinx.Ava.UI.Renderer
         protected nint MetalLayer { get; set; }
 
         public delegate void UpdateBoundsCallbackDelegate(Rect rect);
-
         private UpdateBoundsCallbackDelegate _updateBoundsCallback;
 
         public event EventHandler<nint> WindowCreated;
@@ -50,55 +46,6 @@ namespace Ryujinx.Ava.UI.Renderer
 
         protected virtual void OnWindowDestroyed() { }
 
-        public bool ToggleRenderDocCapture(Switch device)
-        {
-            if (!RenderDoc.IsAvailable) return false;
-
-            if (RenderDoc.IsFrameCapturing)
-            {
-                if (EndRenderDocCapture())
-                {
-                    Logger.Info?.Print(LogClass.Application, "Ended RenderDoc capture.");
-                    return true;
-                }
-            } 
-            else if (StartRenderDocCapture(device))
-            {
-                Logger.Info?.Print(LogClass.Application, "Starting RenderDoc capture.");
-                return true;
-            }
-
-            return false;
-        }
-
-        public bool StartRenderDocCapture(Switch device)
-        {
-            if (!RenderDoc.IsAvailable) return false;
-
-            if (RenderDoc.IsFrameCapturing) return false;
-
-            RenderDoc.StartFrameCapture(nint.Zero, WindowHandle);
-            RenderDoc.SetCaptureTitle(TitleHelper.FormatRenderDocCaptureTitle(device.Processes.ActiveApplication, Program.Version));
-
-            return true;
-        }
-
-        public bool EndRenderDocCapture()
-        {
-            if (!RenderDoc.IsAvailable) return false;
-            if (!RenderDoc.IsFrameCapturing) return false;
-
-            return RenderDoc.IsFrameCapturing && RenderDoc.EndFrameCapture(nint.Zero, WindowHandle);
-        }
-
-        public bool DiscardRenderDocCapture()
-        {
-            if (!RenderDoc.IsAvailable) return false;
-            if (!RenderDoc.IsFrameCapturing) return false;
-
-            return RenderDoc.IsFrameCapturing && RenderDoc.DiscardFrameCapture(nint.Zero, WindowHandle);
-        }
-
         protected virtual void OnWindowDestroying()
         {
             WindowHandle = nint.Zero;
@@ -177,9 +124,7 @@ namespace Ryujinx.Ava.UI.Renderer
             }
             else
             {
-                X11Window = PlatformHelper.CreateOpenGLWindow(
-                    new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false), 0, 0, 100,
-                    100) as GLXWindow;
+                X11Window = PlatformHelper.CreateOpenGLWindow(new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false), 0, 0, 100, 100) as GLXWindow;
             }
 
             if (X11Window != null)
@@ -196,7 +141,7 @@ namespace Ryujinx.Ava.UI.Renderer
         {
             _className = "NativeWindow-" + Guid.NewGuid();
 
-            _wndProcDelegate = delegate(nint hWnd, WindowsMessages msg, nint wParam, nint lParam)
+            _wndProcDelegate = delegate (nint hWnd, WindowsMessages msg, nint wParam, nint lParam)
             {
                 switch (msg)
                 {
@@ -219,8 +164,7 @@ namespace Ryujinx.Ava.UI.Renderer
 
             RegisterClassEx(ref wndClassEx);
 
-            WindowHandle = CreateWindowEx(0, _className, "NativeWindow", WindowStyles.WsChild, 0, 0, 640, 480,
-                control.Handle, nint.Zero, nint.Zero, nint.Zero);
+            WindowHandle = CreateWindowEx(0, _className, "NativeWindow", WindowStyles.WsChild, 0, 0, 640, 480, control.Handle, nint.Zero, nint.Zero, nint.Zero);
 
             SetWindowLongPtrW(control.Handle, GWLP_WNDPROC, wndClassEx.lpfnWndProc);
 

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

@@ -678,7 +678,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                         StrongRumble = 1f,
                         WeakRumble = 1f,
                         EnableRumble = false,
-                        UseHDRumble = false
                     },
                 };
             }

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

@@ -5,12 +5,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
     public partial class RumbleInputViewModel : BaseModel
     {
         [ObservableProperty]
-        public partial float StrongRumble { get; set; }
+        private float _strongRumble;
 
         [ObservableProperty]
-        public partial float WeakRumble { get; set; }
-
-        [ObservableProperty]
-        public partial bool EnableHDRumble { get; set; }
+        private float _weakRumble;
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -7,7 +7,6 @@ using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using System.Runtime.Versioning;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;
@@ -26,7 +25,6 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Cpu;
-using Ryujinx.Graphics.RenderDocApi;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -1835,31 +1833,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
 
-        public void ReloadRenderDocApi()
-        {
-            RenderDoc.ReloadApi(ignoreAlreadyLoaded: true);
-
-            OnPropertyChanged(nameof(ShowStartCaptureButton));
-            OnPropertyChanged(nameof(ShowEndCaptureButton));
-            OnPropertyChanged(nameof(RenderDocIsAvailable));
-
-            if (RenderDoc.IsAvailable)
-                RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
-
-            NotificationHelper.ShowInformation(
-                "RenderDoc API reloaded",
-                RenderDoc.IsAvailable ? "RenderDoc is now available." : "RenderDoc is no longer available."
-            );
-        }
-
-        public void ToggleCapture()
-        {
-            if (ShowLoadProgress) return;
-
-            AppHost.RendererHost.EmbeddedWindow.ToggleRenderDocCapture(AppHost.Device);
-            RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
-        }
-
         public void ToggleFullscreen()
         {
             if (Environment.TickCount64 - LastFullscreenToggle < HotKeyPressDelayMs)
@@ -2139,25 +2112,5 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
         #endregion
-
-        #region Context Menu commands
-
-        public bool ShowStartCaptureButton => !RenderDocIsCapturing && RenderDoc.IsAvailable;
-        public bool ShowEndCaptureButton => RenderDocIsCapturing && RenderDoc.IsAvailable;
-        public static bool RenderDocIsAvailable => RenderDoc.IsAvailable;
-
-        public bool RenderDocIsCapturing
-        {
-            get;
-            set
-            {
-                field = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(ShowStartCaptureButton));
-                OnPropertyChanged(nameof(ShowEndCaptureButton));
-            }
-        }
-
-        #endregion
     }
 }

src/Ryujinx/UI/ViewModels/ProfileSelectorDialogViewModel.cs

@@ -1,14 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System.Collections.ObjectModel;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public partial class ProfileSelectorDialogViewModel : BaseModel
-    {
-
-        [ObservableProperty] private UserId _selectedUserId;
-
-        [ObservableProperty] private ObservableCollection<BaseModel> _profiles = [];
-    }
-}

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

@@ -55,15 +55,6 @@
                     Margin="5,0"
                     Text="{Binding WeakRumble, StringFormat=\{0:0.00\}}" />
             </StackPanel>
-            <CheckBox
-                Margin="5"
-                IsChecked="{Binding EnableHDRumble}">
-                <TextBlock
-                    Margin="0,3,0,0"
-                    VerticalAlignment="Center"
-                    Text="{locale:Locale ControllerSettingsRumbleUseHDRumble}"
-                    ToolTip.Tip="{locale:Locale HDRumbleTooltip}" />
-            </CheckBox>
         </StackPanel>
     </Grid>
 </UserControl>

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

@@ -24,7 +24,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 StrongRumble = config.StrongRumble,
                 WeakRumble = config.WeakRumble,
-                EnableHDRumble = config.UseHDRumble
             };
 
             InitializeComponent();
@@ -50,7 +49,6 @@ namespace Ryujinx.Ava.UI.Views.Input
                 GamepadInputConfig config = viewModel.Config;
                 config.StrongRumble = content._viewModel.StrongRumble;
                 config.WeakRumble = content._viewModel.WeakRumble;
-                config.UseHDRumble = content._viewModel.EnableHDRumble;
             };
 
             await contentDialog.ShowAsync();

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

@@ -227,26 +227,6 @@
                     Click="OpenCheatManagerForCurrentApp"
                     Header="{locale:Locale GameListContextMenuManageCheat}"
                     IsEnabled="{Binding IsGameRunning}" />
-                <Separator IsVisible="{Binding RenderDocIsAvailable}" />
-                <MenuItem
-                    Click="StartRenderDocCapture_Click"
-                    IsVisible="{Binding ShowStartCaptureButton}"
-                    CommandParameter="{Binding}"
-                    Header="{locale:Locale MenuBarActions_StartCapture}"
-                    IsEnabled="{Binding IsGameRunning}" />
-                <MenuItem
-                    Click="EndRenderDocCapture_Click"
-                    IsVisible="{Binding ShowEndCaptureButton}"
-                    CommandParameter="{Binding}"
-                    Header="{locale:Locale MenuBarActions_EndCapture}"
-                    IsEnabled="{Binding IsGameRunning}" />
-                <MenuItem
-                    Click="DiscardRenderDocCapture_Click"
-                    IsVisible="{Binding ShowEndCaptureButton}"
-                    CommandParameter="{Binding}"
-                    Header="{locale:Locale MenuBarActions_DiscardCapture}"
-                    ToolTip.Tip="{locale:Locale MenuBarActions_DiscardCapture_ToolTip}"
-                    IsEnabled="{Binding IsGameRunning}" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{locale:Locale MenuBarTools}">
                 <MenuItem Header="{locale:Locale MenuBarToolsInstallKeys}" IsEnabled="{Binding EnableNonGameRunningControls}">

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

@@ -9,9 +9,7 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Common;
-using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Graphics.RenderDocApi;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.Modules;
 using Ryujinx.UI.App.Common;
@@ -268,52 +266,6 @@ namespace Ryujinx.Ava.UI.Views.Main
             }
         }
 
-        public void StartRenderDocCapture_Click(object sender, RoutedEventArgs args)
-        {
-            MainWindowViewModel viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (!RenderDoc.IsFrameCapturing && RenderDoc.IsAvailable && viewModel is not { ShowLoadProgress: true })
-            {
-                if (viewModel != null && viewModel.AppHost.RendererHost
-                        .EmbeddedWindow.StartRenderDocCapture(viewModel.AppHost.Device))
-                {
-                    Logger.Info?.Print(LogClass.Application, "Starting RenderDoc capture.");
-                }
-            }
-
-            viewModel?.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
-        }
-
-        public void EndRenderDocCapture_Click(object sender, RoutedEventArgs args)
-        {
-            MainWindowViewModel viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (RenderDoc.IsFrameCapturing && RenderDoc.IsAvailable && viewModel is not { ShowLoadProgress: true })
-            {
-                if (viewModel != null && viewModel.AppHost.RendererHost.EmbeddedWindow.EndRenderDocCapture())
-                {
-                    Logger.Info?.Print(LogClass.Application, "Ended RenderDoc capture.");
-                }
-            }
-
-            viewModel?.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
-        }
-
-        public void DiscardRenderDocCapture_Click(object sender, RoutedEventArgs args)
-        {
-            MainWindowViewModel viewModel = (sender as MenuItem)?.DataContext as MainWindowViewModel;
-
-            if (RenderDoc.IsFrameCapturing && RenderDoc.IsAvailable && viewModel is not { ShowLoadProgress: true })
-            {
-                if (viewModel != null && viewModel.AppHost.RendererHost.EmbeddedWindow.DiscardRenderDocCapture())
-                {
-                    Logger.Info?.Print(LogClass.Application, "Discarded RenderDoc capture.");
-                }
-            }
-
-            viewModel?.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
-        }
-
         public async void CheckForUpdates(object sender, RoutedEventArgs e)
         {
             if (Updater.CanUpdate(true))

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -43,8 +43,6 @@
         <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
         <KeyBinding Gesture="Ctrl+," Command="{Binding OpenSettings}" />
         <KeyBinding Gesture="Ctrl+R" Command="{Binding RestartEmulation}" />
-        <KeyBinding Gesture="Ctrl+Shift+R" Command="{Binding ReloadRenderDocApi}" />
-        <KeyBinding Gesture="Ctrl+Shift+C" Command="{Binding ToggleCapture}" />
     </Window.KeyBindings>
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
         <Grid.RowDefinitions>

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

@@ -6,8 +6,6 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.UI.Common.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows
@@ -83,17 +81,20 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            List<XCITrimmerFileModel> added = [.. e.AddedItems.OfType<XCITrimmerFileModel>()];
-            List<XCITrimmerFileModel> removed = [.. e.RemovedItems.OfType<XCITrimmerFileModel>()];
-
-            foreach (XCITrimmerFileModel applicationData in added)
+            foreach (object content in e.AddedItems)
             {
-                ViewModel.Select(applicationData);
+                if (content is XCITrimmerFileModel applicationData)
+                {
+                    ViewModel.Select(applicationData);
+                }
             }
 
-            foreach (XCITrimmerFileModel applicationData in removed)
+            foreach (object content in e.RemovedItems)
             {
-                ViewModel.Deselect(applicationData);
+                if (content is XCITrimmerFileModel applicationData)
+                {
+                    ViewModel.Deselect(applicationData);
+                }
             }
         }
     }