Start building more accurate vertex as compute usage info

- Fixes

Directory.Packages.props

@@ -8,14 +8,14 @@
     <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.1" />
-    <PackageVersion Include="Svg.Controls.Avalonia" Version="12.0.0.15" />
-    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.15" />
+    <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" />
@@ -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.11" />
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.10" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
   </ItemGroup>
 </Project>

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.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.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/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/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/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/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/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/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);
+                }
             }
         }
     }