Support VK_EXT_extended_dynamic_state and VK_EXT_extended_dynamic_state2

Heap adjustments
- Increase heap limit to 8 GiB for games that crash with > 8 GiB heap. This was inadvertently limited to 6 GiB for 10 & 12 GiB DRAM sizes.
2026-09-27 15:30:08 +02:00 · 2026-09-19 23:59:40 -05:00 · 2026-09-19 23:56:11 -05:00 · 2026-09-19 16:52:04 -05:00 · 2026-09-18 22:41:02 +00:00 · 2026-09-18 00:11:05 -05:00
120 changed files with 4424 additions and 973 deletions
@@ -3,25 +3,25 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="12.1.1" />
+    <PackageVersion Include="Avalonia" Version="12.1.2" />
    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="12.1.2" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.1.2" />
    <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.13" />
-    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.13" />
+    <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="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.0.2" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="3.1.0" />
    <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.21.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.22.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
    <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,9 +36,9 @@
    <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.2-ryujinx.6" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.3-ryujinx.1" />
    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
-    <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.707.0" />
+    <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.918.0" />
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
    <PackageVersion Include="Silk.NET.Shaderc" Version="2.23.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.10" />
+    <PackageVersion Include="System.IO.Hashing" Version="10.0.12" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
  </ItemGroup>
-</Project>
+</Project>
@@ -21,6 +21,7 @@
  <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" />
@@ -32,14 +32,11 @@ namespace ARMeilleure.Translation.PTC
        private const string OuterHeaderMagicString = "PTCohd\0\0";
        private const string InnerHeaderMagicString = "PTCihd\0\0";

-        private const uint InternalVersion = 7020; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7031; //! 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);
@@ -67,8 +64,7 @@ namespace ARMeilleure.Translation.PTC

        private bool _disposed;

-        public string TitleIdText { get; private set; }
-        public string DisplayVersion { get; private set; }
+        public PtcCacheInfo CacheInfo { get; private set; }

        private MemoryManagerType _memoryMode;

@@ -97,8 +93,7 @@ namespace ARMeilleure.Translation.PTC

            _disposed = false;

-            TitleIdText = TitleIdTextDefault;
-            DisplayVersion = DisplayVersionDefault;
+            CacheInfo = new PtcCacheInfo(0, null, null, 0, null, "Unknown", "default");

            CachePathActual = string.Empty;
            CachePathBackup = string.Empty;
@@ -106,20 +101,24 @@ namespace ARMeilleure.Translation.PTC
            Disable();
        }

-        public void Initialize(string titleIdText, string displayVersion, bool enabled, MemoryManagerType memoryMode, string cacheSelector)
+        public void Initialize(PtcCacheInfo cacheInfo, bool enabled, MemoryManagerType memoryMode)
        {
            Wait();

            Profiler.Wait();
            Profiler.ClearEntries();

-            Logger.Info?.Print(LogClass.Ptc, $"Initializing Profiled Persistent Translation Cache v{InternalVersion}\n\t\t (title: {titleIdText}, version: '{displayVersion}', selector: '{cacheSelector}', enabled: {enabled}).");
+            CacheInfo = cacheInfo;

-            if (!enabled || string.IsNullOrEmpty(titleIdText) || titleIdText == TitleIdTextDefault)
+            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)
            {
-                TitleIdText = TitleIdTextDefault;
-                DisplayVersion = DisplayVersionDefault;
-
                CachePathActual = string.Empty;
                CachePathBackup = string.Empty;

@@ -128,12 +127,10 @@ namespace ARMeilleure.Translation.PTC
                return;
            }

-            TitleIdText = titleIdText;
-            DisplayVersion = !string.IsNullOrEmpty(displayVersion) ? displayVersion : DisplayVersionDefault;
            _memoryMode = memoryMode;

-            string workPathActual = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", ActualDir);
-            string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, TitleIdText, "cache", "cpu", BackupDir);
+            string workPathActual = Path.Combine(AppDataManager.GamesDirPath, CacheInfo.TitleIdText, "cache", "cpu", ActualDir);
+            string workPathBackup = Path.Combine(AppDataManager.GamesDirPath, CacheInfo.TitleIdText, "cache", "cpu", BackupDir);

            if (!Directory.Exists(workPathActual))
            {
@@ -145,8 +142,14 @@ namespace ARMeilleure.Translation.PTC
                Directory.CreateDirectory(workPathBackup);
            }

-            CachePathActual = Path.Combine(workPathActual, DisplayVersion) + "-" + cacheSelector;
-            CachePathBackup = Path.Combine(workPathBackup, DisplayVersion) + "-" + cacheSelector;
+            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}').");

            PreLoad();
            Profiler.PreLoad();
@@ -370,7 +373,12 @@ namespace ARMeilleure.Translation.PTC

            long fileSize = new FileInfo(fileName).Length;

-            Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Translation Cache" : "Loaded Translation Cache")} (size: {fileSize} bytes, translated functions: {GetEntriesCount()}).");
+            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()}).");

            return true;
        }
@@ -0,0 +1,37 @@
+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;
+        }
+    }
+}
@@ -23,7 +23,7 @@ namespace ARMeilleure.Translation.PTC
    {
        private const string OuterHeaderMagicString = "Pohd\0\0\0\0";

-        private const uint InternalVersion = 6698; //! Not to be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7031; //! Not to be incremented manually for each change to the ARMeilleure project.

        private static readonly uint[] _migrateInternalVersions = 
        [
@@ -254,7 +254,12 @@ namespace ARMeilleure.Translation.PTC

            long fileSize = new FileInfo(fileName).Length;

-            Logger.Info?.Print(LogClass.Ptc, $"{(isBackup ? "Loaded Backup Profiling Info" : "Loaded Profiling Info")} (size: {fileSize} bytes, profiled functions: {ProfiledFuncs.Count}).");
+            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}).");

            return true;
        }
@@ -375,7 +380,11 @@ namespace ARMeilleure.Translation.PTC

            if (fileSize != 0L)
            {
-                Logger.Info?.Print(LogClass.Ptc, $"Saved Profiling Info (size: {fileSize} bytes, profiled functions: {profiledFuncsCount}).");
+                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}).");
            }
        }

@@ -61,9 +61,9 @@ namespace ARMeilleure.Translation
            FunctionTable.Fill = (ulong)Stubs.SlowDispatchStub;
        }

-        public IPtcLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IPtcLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
        {
-            _ptc.Initialize(titleIdText, displayVersion, enabled, Memory.Type, cacheSelector);
+            _ptc.Initialize(cacheInfo, enabled, Memory.Type);
            return _ptc;
        }

@@ -16,5 +16,10 @@ 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; }
    }
 }
@@ -126,8 +126,13 @@ namespace Ryujinx.Common

        public static string[] GetAllAvailableResources(string path, string ext = "")
        {
-            return ResolveManifestPath(path).Item1.GetManifestResourceNames()
-                .Where(r => r.EndsWith(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))
                .ToArray();
        }

@@ -1,4 +1,5 @@
 using ARMeilleure.Memory;
+using ARMeilleure.Translation.PTC;
 using System.Runtime.Versioning;

 namespace Ryujinx.Cpu.AppleHv
@@ -32,7 +33,7 @@ namespace Ryujinx.Cpu.AppleHv
        {
        }

-        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
        {
            return new DummyDiskCacheLoadState();
        }
@@ -1,4 +1,5 @@
 using System;
+using ARMeilleure.Translation.PTC;

 namespace Ryujinx.Cpu
 {
@@ -44,11 +45,10 @@ 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="titleIdText">Title ID of the application in padded hex form</param>
-        /// <param name="displayVersion">Version of the application</param>
+        /// <param name="cacheInfo">Identity and selector for the process-owned disk cache</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(string titleIdText, string displayVersion, bool enabled, string cacheSelector);
+        IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled);

        /// <summary>
        /// Indicates that code has been loaded into guest memory, and that it might be executed in the future.
@@ -1,6 +1,7 @@
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
 using ARMeilleure.Translation;
+using ARMeilleure.Translation.PTC;
 using Ryujinx.Cpu.Signal;

 namespace Ryujinx.Cpu.Jit
@@ -51,9 +52,9 @@ namespace Ryujinx.Cpu.Jit
        }

        /// <inheritdoc/>
-        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
        {
-            return new JitDiskCacheLoadState(_translator.LoadDiskCache(titleIdText, displayVersion, enabled, cacheSelector));
+            return new JitDiskCacheLoadState(_translator.LoadDiskCache(cacheInfo, enabled));
        }

        /// <inheritdoc/>
@@ -1,5 +1,6 @@
 using ARMeilleure.Common;
 using ARMeilleure.Memory;
+using ARMeilleure.Translation.PTC;
 using Ryujinx.Cpu.Jit;
 using Ryujinx.Cpu.LightningJit.State;

@@ -46,7 +47,7 @@ namespace Ryujinx.Cpu.LightningJit
        }

        /// <inheritdoc/>
-        public IDiskCacheLoadState LoadDiskCache(string titleIdText, string displayVersion, bool enabled, string cacheSelector)
+        public IDiskCacheLoadState LoadDiskCache(PtcCacheInfo cacheInfo, bool enabled)
        {
            return new DummyDiskCacheLoadState();
        }
@@ -51,6 +51,10 @@ namespace Ryujinx.Graphics.GAL
        public readonly bool SupportsViewportSwizzle;
        public readonly bool SupportsIndirectParameters;
        public readonly bool SupportsDepthClipControl;
+        public readonly bool SupportsExtendedDynamicState;
+        public readonly bool SupportsExtendedDynamicState2;
+        public readonly bool SupportsLogicOpDynamicState;
+        public readonly bool SupportsPatchControlPointsDynamicState;

        public readonly int UniformBufferSetIndex;
        public readonly int StorageBufferSetIndex;
@@ -120,6 +124,10 @@ namespace Ryujinx.Graphics.GAL
            bool supportsViewportSwizzle,
            bool supportsIndirectParameters,
            bool supportsDepthClipControl,
+            bool supportsExtendedDynamicState,
+            bool supportsExtendedDynamicState2,
+            bool supportsLogicOpDynamicState,
+            bool supportsPatchControlPointsDynamicState,
            int uniformBufferSetIndex,
            int storageBufferSetIndex,
            int textureSetIndex,
@@ -183,6 +191,10 @@ namespace Ryujinx.Graphics.GAL
            SupportsViewportSwizzle = supportsViewportSwizzle;
            SupportsIndirectParameters = supportsIndirectParameters;
            SupportsDepthClipControl = supportsDepthClipControl;
+            SupportsExtendedDynamicState = supportsExtendedDynamicState;
+            SupportsExtendedDynamicState2 = supportsExtendedDynamicState2;
+            SupportsLogicOpDynamicState = supportsLogicOpDynamicState;
+            SupportsPatchControlPointsDynamicState = supportsPatchControlPointsDynamicState;
            UniformBufferSetIndex = uniformBufferSetIndex;
            StorageBufferSetIndex = storageBufferSetIndex;
            TextureSetIndex = textureSetIndex;
@@ -2,6 +2,7 @@ namespace Ryujinx.Graphics.GAL
 {
    public enum Face
    {
+        None = 0,
        Front = 0x404,
        Back = 0x405,
        FrontAndBack = 0x408,
@@ -5,12 +5,14 @@ namespace Ryujinx.Graphics.GAL
        public string GpuVendor { get; }
        public string GpuModel { get; }
        public string GpuDriver { get; }
+        public string GpuDriverVersion { get; }

-        public HardwareInfo(string gpuVendor, string gpuModel, string gpuDriver)
+        public HardwareInfo(string gpuVendor, string gpuModel, string gpuDriver, string gpuDriverVersion)
        {
            GpuVendor = gpuVendor;
            GpuModel = gpuModel;
            GpuDriver = gpuDriver;
+            GpuDriverVersion = gpuDriverVersion;
        }
    }
 }
@@ -50,9 +50,9 @@ namespace Ryujinx.Graphics.GAL
        void SetDepthBias(PolygonModeMask enables, float factor, float units, float clamp);
        void SetDepthClamp(bool clamp);
        void SetDepthMode(DepthMode mode);
-        void SetDepthTest(DepthTestDescriptor depthTest);
+        void SetDepthTest(DepthTestDescriptor depthTest, bool signalChange = true);

-        void SetFaceCulling(bool enable, Face face);
+        void SetFaceCulling(Face face);

        void SetFrontFace(FrontFace frontFace);

@@ -75,16 +75,16 @@ namespace Ryujinx.Graphics.GAL

        void SetPrimitiveRestart(bool enable, int index);

-        void SetPrimitiveTopology(PrimitiveTopology topology);
+        void SetPrimitiveTopology(PrimitiveTopology topology, bool signalChange = true);

-        void SetProgram(IProgram program);
+        void SetProgram(IProgram program, bool signalChange = true);

        void SetRasterizerDiscard(bool discard);

-        void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask);
+        void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask, bool signalChange = true);
        void SetRenderTargets(Span<ITexture> colors, ITexture depthStencil);

-        void SetScissors(ReadOnlySpan<Rectangle<int>> regions);
+        void SetScissors(ReadOnlySpan<Rectangle<int>> regions, bool signalChange = true);

        void SetStencilTest(StencilTestDescriptor stencilTest);

@@ -102,7 +102,7 @@ namespace Ryujinx.Graphics.GAL
        void SetVertexAttribs(ReadOnlySpan<VertexAttribDescriptor> vertexAttribs);
        void SetVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers);

-        void SetViewports(ReadOnlySpan<Viewport> viewports);
+        void SetViewports(ReadOnlySpan<Viewport> viewports, bool signalChange = true);

        void TextureBarrier();
        void TextureBarrierTiled();
@@ -3,18 +3,16 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands
    struct SetFaceCullingCommand : IGALCommand, IGALCommand<SetFaceCullingCommand>
    {
        public readonly CommandType CommandType => CommandType.SetFaceCulling;
-        private bool _enable;
        private Face _face;

-        public void Set(bool enable, Face face)
+        public void Set(Face face)
        {
-            _enable = enable;
            _face = face;
        }

        public static void Run(ref SetFaceCullingCommand command, ThreadedRenderer threaded, IRenderer renderer)
        {
-            renderer.Pipeline.SetFaceCulling(command._enable, command._face);
+            renderer.Pipeline.SetFaceCulling(command._face);
        }
    }
 }
@@ -158,15 +158,15 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            _renderer.QueueCommand();
        }

-        public unsafe void SetDepthTest(DepthTestDescriptor depthTest)
+        public unsafe void SetDepthTest(DepthTestDescriptor depthTest, bool signalChange = true)
        {
            _renderer.New<SetDepthTestCommand>()->Set(depthTest);
            _renderer.QueueCommand();
        }

-        public unsafe void SetFaceCulling(bool enable, Face face)
+        public unsafe void SetFaceCulling(Face face)
        {
-            _renderer.New<SetFaceCullingCommand>()->Set(enable, face);
+            _renderer.New<SetFaceCullingCommand>()->Set(face);
            _renderer.QueueCommand();
        }

@@ -242,13 +242,13 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            _renderer.QueueCommand();
        }

-        public unsafe void SetPrimitiveTopology(PrimitiveTopology topology)
+        public unsafe void SetPrimitiveTopology(PrimitiveTopology topology, bool signalChange = true)
        {
            _renderer.New<SetPrimitiveTopologyCommand>()->Set(topology);
            _renderer.QueueCommand();
        }

-        public unsafe void SetProgram(IProgram program)
+        public unsafe void SetProgram(IProgram program, bool signalChange = true)
        {
            _renderer.New<SetProgramCommand>()->Set(Ref(program));
            _renderer.QueueCommand();
@@ -260,7 +260,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            _renderer.QueueCommand();
        }

-        public unsafe void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask)
+        public unsafe void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask, bool signalChange = true)
        {
            _renderer.New<SetRenderTargetColorMasksCommand>()->Set(_renderer.CopySpan(componentMask));
            _renderer.QueueCommand();
@@ -275,7 +275,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            _renderer.QueueCommand();
        }

-        public unsafe void SetScissors(ReadOnlySpan<Rectangle<int>> scissors)
+        public unsafe void SetScissors(ReadOnlySpan<Rectangle<int>> scissors, bool signalChange = true)
        {
            _renderer.New<SetScissorsCommand>()->Set(_renderer.CopySpan(scissors));
            _renderer.QueueCommand();
@@ -341,7 +341,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            _renderer.QueueCommand();
        }

-        public unsafe void SetViewports(ReadOnlySpan<Viewport> viewports)
+        public unsafe void SetViewports(ReadOnlySpan<Viewport> viewports, bool signalChange = true)
        {
            _renderer.New<SetViewportsCommand>()->Set(_renderer.CopySpan(viewports));
            _renderer.QueueCommand();
@@ -51,11 +51,12 @@ namespace Ryujinx.Graphics.GAL
        public StencilTestDescriptor StencilTest;
        public FrontFace FrontFace;
        public Face CullMode;
-        public bool CullEnable;

        public PolygonModeMask BiasEnable;

-        public float LineWidth;
+        public bool AlphaToCoverageEnable;
+        public bool AlphaToOneEnable;
+
        // TODO: Polygon mode.
        public bool DepthClampEnable;
        public bool RasterizerDiscard;
@@ -63,6 +64,9 @@ namespace Ryujinx.Graphics.GAL
        public bool PrimitiveRestartEnable;
        public uint PatchControlPoints;

+        public float DepthBiasUnits;
+        public float DepthBiasFactor;
+
        public DepthMode DepthMode;

        public void SetVertexAttribs(ReadOnlySpan<VertexAttribDescriptor> vertexAttribs)
@@ -16,19 +16,18 @@ namespace Ryujinx.Graphics.GAL

    public static class TargetExtensions
    {
-        public static bool IsMultisample(this Target target)
+        extension(Target target)
        {
-            return target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray;
-        }
+            public bool IsMultisample => target is Target.Texture2DMultisample or Target.Texture2DMultisampleArray;

-        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;
+            public bool HasDepthOrLayers =>
+                target is 
+                    Target.Texture3D or
+                    Target.Texture1DArray or
+                    Target.Texture2DArray or
+                    Target.Texture2DMultisampleArray or
+                    Target.Cubemap or
+                    Target.CubemapArray;
        }
    }
 }
@@ -861,6 +861,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
            enables |= (depthBias.FillEnable ? PolygonModeMask.Fill : 0);

            _pipeline.BiasEnable = enables;
+            _pipeline.DepthBiasUnits = units / 2f;
+            _pipeline.DepthBiasFactor = factor;
+
            _context.Renderer.Pipeline.SetDepthBias(enables, factor, units / 2f, clamp);
        }

@@ -1034,7 +1037,6 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
            float width = _state.State.LineWidthSmooth;
            bool smooth = _state.State.LineSmoothEnable;

-            _pipeline.LineWidth = width;
            _context.Renderer.Pipeline.SetLineParameters(width, smooth);
        }

@@ -1216,9 +1218,16 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
            YControl yControl = _state.State.YControl;
            FaceState face = _state.State.FaceState;

-            _pipeline.CullEnable = face.CullEnable;
-            _pipeline.CullMode = face.CullFace;
-            _context.Renderer.Pipeline.SetFaceCulling(face.CullEnable, face.CullFace);
+            if (face.CullEnable)
+            {
+                _pipeline.CullMode = face.CullFace;
+                _context.Renderer.Pipeline.SetFaceCulling(face.CullFace);
+            }
+            else
+            {
+                _pipeline.CullMode = Face.None;
+                _context.Renderer.Pipeline.SetFaceCulling(Face.None);
+            }

            UpdateFrontFace(yControl, face.FrontFace);
        }
@@ -1416,6 +1425,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
            bool alphaToCoverageEnable = (_state.State.MultisampleControl & 1) != 0;
            bool alphaToOneEnable = (_state.State.MultisampleControl & 0x10) != 0;

+            _pipeline.AlphaToCoverageEnable = alphaToCoverageEnable;
+            _pipeline.AlphaToOneEnable = alphaToOneEnable;
            _context.Renderer.Pipeline.SetMultisampleState(new MultisampleDescriptor(
                alphaToCoverageEnable,
                _state.State.AlphaToCoverageDitherEnable,
@@ -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(this, _context.Capabilities) && Group.FlushModified(this, tracked);
+            return TextureCompatibility.CanTextureFlush(Info, _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(this, _context.Capabilities))
+            if (TextureCompatibility.CanTextureFlush(Info, _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;
@@ -195,16 +195,6 @@ 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.
@@ -212,14 +202,15 @@ 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>
-        private static bool CanTextureFlush(TextureInfo info, in Capabilities caps)
+       public static bool CanTextureFlush(TextureInfo info, Capabilities caps)
        {
-            if (IsFormatHostIncompatible(info, in caps))
+            if (IsFormatHostIncompatible(info, 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.
            }
@@ -381,12 +372,15 @@ namespace Ryujinx.Graphics.Gpu.Image
            }

            // Some APIs align the width for copy and render target textures,
-            // so the width may not match in this case for different uses of the same texture.
+            // so the width may not match for different uses of the same texture.
            // To account for this, we compare the aligned width here.
-            // We expect height to always match exactly, if the texture is the same.
+            // However, matching block footprints are not sufficient for compressed textures;
+            // their logical dimensions must also match.
            if (alignedWidthMatches && lhsSize.Height == rhsSize.Height)
            {
-                return (exact && lhsSize.Width != rhsSize.Width) || lhsSize.Width < rhsSize.Width
+                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
                    ? TextureViewCompatibility.CopyOnly
                    : result;
            }
@@ -397,7 +391,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.
@@ -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,7 +182,11 @@ namespace Ryujinx.Graphics.Gpu.Image
        {
            foreach (TextureIncompatibleOverlap overlap in _incompatibleOverlaps)
            {
-                if (overlap.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
+                // 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)
                {
                    CreateCopyDependency(overlap.Group, false, overlap.Compatibility);
                }
@@ -226,7 +230,6 @@ 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.
@@ -324,7 +327,7 @@ namespace Ryujinx.Graphics.Gpu.Image
        {
            FlushIncompatibleOverlapsIfNeeded();

-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, _) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
            {
                bool dirty = false;
                bool anyModified = false;
@@ -479,7 +482,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, _, _) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
            {
                for (int i = 0; i < regionCount; i++)
                {
@@ -571,7 +574,7 @@ namespace Ryujinx.Graphics.Gpu.Image
            tracked = tracked || ShouldFlushTriggerTracking();
            bool flushed = false;

-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, _) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
            {
                int startSlice = 0;
                int endSlice = 0;
@@ -652,14 +655,14 @@ namespace Ryujinx.Graphics.Gpu.Image

            if (_flushBuffer == BufferHandle.Null)
            {
-                if (!TextureCompatibility.CanTextureFlush(Storage, _context.Capabilities))
+                if (!TextureCompatibility.CanTextureFlush(Storage.Info, _context.Capabilities))
                {
                    return;
                }

                bool canImport = Storage.Info.IsLinear && Storage.Info.Stride >= Storage.Info.Width * Storage.Info.FormatInfo.BytesPerPixel;

-                IntPtr hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;
+                nint hostPointer = canImport ? _physicalMemory.GetHostPointer(Storage.Range) : 0;

                if (hostPointer != 0 && _context.Renderer.PrepareHostMapping(hostPointer, Storage.Size))
                {
@@ -716,7 +719,7 @@ namespace Ryujinx.Graphics.Gpu.Image

            ClearIncompatibleOverlaps(texture);

-            EvaluateRelevantHandles(texture, (baseHandle, regionCount, _, _) =>
+            EvaluateRelevantHandles(texture, (baseHandle, regionCount, split, bound) =>
            {
                for (int i = 0; i < regionCount; i++)
                {
@@ -1049,7 +1052,7 @@ namespace Ryujinx.Graphics.Gpu.Image
            int endOffset = _allOffsets[viewEnd] + _sliceSizes[lastLevel];
            int size = endOffset - offset;

-            List<RegionHandle> result = new();
+            List<RegionHandle> result = [];

            for (int i = 0; i < TextureRange.Count; i++)
            {
@@ -1163,7 +1166,6 @@ namespace Ryujinx.Graphics.Gpu.Image
            SignalAllDirty();
        }

-
        /// <summary>
        /// Removes a view from the group, removing it from all overlap lists.
        /// </summary>
@@ -1385,7 +1387,7 @@ namespace Ryujinx.Graphics.Gpu.Image

                if (_is3D)
                {
-                    List<TextureGroupHandle> handlesList = new();
+                    List<TextureGroupHandle> handlesList = [];

                    for (int i = 0; i < levelHandles; i++)
                    {
@@ -1468,15 +1470,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 = new();
-            List<(int BaseHandle, int RegionCount)> otherRange = new();
+            List<(int BaseHandle, int RegionCount)> targetRange = [];
+            List<(int BaseHandle, int RegionCount)> otherRange = [];

-            EvaluateRelevantHandles(firstLayer, firstLevel, other.Info.GetSlices(), other.Info.Levels, (baseHandle, regionCount, _, _) =>
+            EvaluateRelevantHandles(firstLayer, firstLevel, other.Info.GetSlices(), other.Info.Levels, (baseHandle, regionCount, split, specialData) =>
            {
                targetRange.Add((baseHandle, regionCount));
                return true;
            }, out _);
-            otherGroup.EvaluateRelevantHandles(other, (baseHandle, regionCount, _, _) =>
+            otherGroup.EvaluateRelevantHandles(other, (baseHandle, regionCount, split, specialData) =>
            {
                otherRange.Add((baseHandle, regionCount));
                return true;
@@ -1601,7 +1603,15 @@ namespace Ryujinx.Graphics.Gpu.Image
                        TextureInfo info = Storage.Info;
                        TextureInfo otherInfo = other.Storage.Info;

-                        bool textureCopy = TextureCompatibility.ViewLayoutCompatible(info, otherInfo, level, otherLevel) &&
+                        // 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) &&
                            TextureCompatibility.CopySizeMatches(info, otherInfo, level, otherLevel);

                        if (textureCopy || rawCopy)
@@ -1659,9 +1669,12 @@ namespace Ryujinx.Graphics.Gpu.Image
        {
            if (!_incompatibleOverlaps.Any(overlap => overlap.Group == other.Group))
            {
-                if (copy && other.Compatibility <= TextureViewCompatibility.LayoutIncompatible)
+                if (copy && other.Compatibility <= TextureViewCompatibility.Incompatible)
                {
                    // 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);
                }

@@ -1763,7 +1776,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                    }
                }

-                if (TextureCompatibility.CanTextureFlush(Storage, _context.Capabilities) && !(inBuffer && _flushBufferImported))
+                if (TextureCompatibility.CanTextureFlush(Storage.Info, _context.Capabilities) && !(inBuffer && _flushBufferImported))
                {
                    FlushSliceRange(false, handle.BaseSlice, handle.BaseSlice + handle.SliceCount, inBuffer, Storage.GetFlushTexture());
                }
@@ -1803,4 +1816,3 @@ namespace Ryujinx.Graphics.Gpu.Image
        }
    }
 }
-
@@ -717,6 +717,7 @@ namespace Ryujinx.Graphics.Gpu.Image
                }

                DeferredCopy = old.DeferredCopy;
+                DeferredCopyRaw = old.DeferredCopyRaw;
            }
        }

@@ -22,6 +22,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
        private readonly CancellationToken _cancellationToken;
        private readonly Action<ShaderCacheState, int, int> _stateChangeCallback;

+        private readonly HashSet<ProgramPipelineState> _pipelineStateSet = new();
+
        /// <summary>
        /// Indicates if the cache should be loaded.
        /// </summary>
@@ -232,10 +234,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache

            for (int index = 0; index < ThreadCount; index++)
            {
-                workThreads[index] = new Thread(ProcessAsyncQueue)
-                {
-                    Name = $"GPU.AsyncTranslationThread.{index}",
-                };
+                workThreads[index] = new Thread(ProcessAsyncQueue) { Name = $"GPU.AsyncTranslationThread.{index}", };
            }

            int programCount = _hostStorage.GetProgramCount();
@@ -305,6 +304,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                        using DiskCacheOutputStreams streams = _hostStorage.GetOutputStreams(_context);

                        int packagedShaders = 0;
+                        ProgramPipelineState currentPipelineState = default;
+
                        foreach (KeyValuePair<int, (CachedShaderProgram, byte[])> kv in _programList)
                        {
                            if (!Active)
@@ -314,12 +315,53 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache

                            (CachedShaderProgram program, byte[] binaryCode) = kv.Value;

-                            _hostStorage.AddShader(_context, program, binaryCode, streams);
+                            if (program.SpecializationState.PipelineState.HasValue && _context.Capabilities.SupportsExtendedDynamicState)
+                            {
+                                currentPipelineState = program.SpecializationState.PipelineState.Value;

-                            _stateChangeCallback(ShaderCacheState.Packaging, ++packagedShaders, _programList.Count);
+                                if (_context.Capabilities.SupportsExtendedDynamicState)
+                                {
+                                    currentPipelineState.StencilTest = default;
+
+                                    currentPipelineState.CullMode = 0;
+                                    currentPipelineState.FrontFace = 0;
+                                    currentPipelineState.DepthTest = default;
+                                    currentPipelineState.Topology = ConvertToClass(currentPipelineState.Topology);
+                                }
+
+                                if (_context.Capabilities.SupportsExtendedDynamicState2)
+                                {
+                                    currentPipelineState.PrimitiveRestartEnable = false;
+                                    currentPipelineState.BiasEnable = 0;
+                                    currentPipelineState.RasterizerDiscard = false;
+                                }
+
+                                if (_context.Capabilities.SupportsLogicOpDynamicState)
+                                {
+                                    currentPipelineState.LogicOp = 0;
+                                }
+
+                                if (_context.Capabilities.SupportsPatchControlPointsDynamicState)
+                                {
+                                    currentPipelineState.PatchControlPoints = 0;
+                                }
+                            }
+
+                            if (!_pipelineStateSet.Contains(currentPipelineState) ||
+                                !_context.Capabilities.SupportsExtendedDynamicState ||
+                                !program.SpecializationState.PipelineState.HasValue)
+                            {
+                                _hostStorage.AddShader(_context, program, binaryCode, streams);
+
+                                _stateChangeCallback(ShaderCacheState.Packaging, ++packagedShaders, _programList.Count);
+
+                                if (_context.Capabilities.SupportsExtendedDynamicState)
+                                {
+                                    _pipelineStateSet.Add(currentPipelineState);
+                                }
+                            }
                        }
-
-                        Logger.Info?.Print(LogClass.Gpu, $"Rebuilt {_programList.Count} shaders successfully.");
+                        Logger.Info?.Print(LogClass.Gpu, $"Rebuilt {packagedShaders} shaders successfully.");
                    }
                    else
                    {
@@ -343,6 +385,29 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
            _stateChangeCallback(ShaderCacheState.Loaded, programCount, programCount);
        }

+        private PrimitiveTopology ConvertToClass(PrimitiveTopology topology)
+        {
+            return topology switch
+            {
+                PrimitiveTopology.Points => PrimitiveTopology.Points,
+                PrimitiveTopology.Lines or
+                    PrimitiveTopology.LineStrip or
+                    PrimitiveTopology.LinesAdjacency or
+                    PrimitiveTopology.LineStripAdjacency => PrimitiveTopology.Lines,
+                PrimitiveTopology.Triangles or
+                    PrimitiveTopology.TriangleStrip or
+                    PrimitiveTopology.TriangleFan or
+                    PrimitiveTopology.TrianglesAdjacency or
+                    PrimitiveTopology.TriangleStripAdjacency or
+                    PrimitiveTopology.Polygon => PrimitiveTopology.TriangleStrip,
+                PrimitiveTopology.Patches => PrimitiveTopology.Patches,
+                PrimitiveTopology.Quads => PrimitiveTopology.Quads,
+                PrimitiveTopology.QuadStrip => PrimitiveTopology.QuadStrip,
+                PrimitiveTopology.LineLoop => PrimitiveTopology.LineLoop,
+                _ => PrimitiveTopology.TriangleStrip,
+            };
+        }
+
        /// <summary>
        /// Enqueues a host program for compilation.
        /// </summary>
@@ -20,6 +20,27 @@ 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();
@@ -34,6 +55,12 @@ 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)
        {
@@ -105,13 +132,20 @@ namespace Ryujinx.Graphics.OpenGL
            _colorsCount = colorsCount;
        }

-        private static void SetDrawBuffersImpl(int colorsCount)
+        private void SetDrawBuffersImpl(int colorsCount)
        {
            DrawBuffersEnum[] drawBuffers = new DrawBuffersEnum[colorsCount];

            for (int index = 0; index < colorsCount; index++)
            {
-                drawBuffers[index] = DrawBuffersEnum.ColorAttachment0 + index;
+                if (_colors[index] != null)
+                {
+                    drawBuffers[index] = DrawBuffersEnum.ColorAttachment0 + index;
+                }
+                else
+                {
+                    drawBuffers[index] = DrawBuffersEnum.None;
+                }
            }

            GL.DrawBuffers(colorsCount, drawBuffers);
@@ -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,
@@ -133,7 +133,7 @@ namespace Ryujinx.Graphics.OpenGL

        public HardwareInfo GetHardwareInfo()
        {
-            return new HardwareInfo(GpuVendor, GpuRenderer, GpuVendor); // OpenGL does not provide a driver name, vendor name is closest analogue.
+            return new HardwareInfo(GpuVendor, GpuRenderer, GpuVendor, GpuVersion); // OpenGL does not provide a driver name, vendor name is closest analogue.
        }

        public PinnedSpan<byte> GetBufferData(BufferHandle buffer, int offset, int size)
@@ -193,6 +193,10 @@ namespace Ryujinx.Graphics.OpenGL
                supportsViewportSwizzle: HwCapabilities.SupportsViewportSwizzle,
                supportsIndirectParameters: HwCapabilities.SupportsIndirectParameters,
                supportsDepthClipControl: true,
+                supportsExtendedDynamicState: false,
+                supportsExtendedDynamicState2: false,
+                supportsLogicOpDynamicState: false,
+                supportsPatchControlPointsDynamicState: false,
                uniformBufferSetIndex: 0,
                storageBufferSetIndex: 1,
                textureSetIndex: 2,
@@ -898,7 +898,7 @@ namespace Ryujinx.Graphics.OpenGL
            }
        }

-        public void SetDepthTest(DepthTestDescriptor depthTest)
+        public void SetDepthTest(DepthTestDescriptor depthTest, bool signalChange = true)
        {
            if (depthTest.TestEnable)
            {
@@ -915,11 +915,11 @@ namespace Ryujinx.Graphics.OpenGL
            _depthTestEnable = depthTest.TestEnable;
        }

-        public void SetFaceCulling(bool enable, Face face)
+        public void SetFaceCulling(Face face)
        {
-            _cullEnable = enable;
+            _cullEnable = face != Face.None;

-            if (!enable)
+            if (!_cullEnable)
            {
                GL.Disable(EnableCap.CullFace);
                return;
@@ -1107,12 +1107,12 @@ namespace Ryujinx.Graphics.OpenGL
            GL.Enable(EnableCap.PrimitiveRestart);
        }

-        public void SetPrimitiveTopology(PrimitiveTopology topology)
+        public void SetPrimitiveTopology(PrimitiveTopology topology, bool signalChange = true)
        {
            _primitiveType = topology.Convert();
        }

-        public void SetProgram(IProgram program)
+        public void SetProgram(IProgram program, bool signalChange = true)
        {
            Program prg = (Program)program;

@@ -1154,7 +1154,7 @@ namespace Ryujinx.Graphics.OpenGL
            _rasterizerDiscard = discard;
        }

-        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMasks)
+        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMasks, bool signalChange = true)
        {
            _componentMasks = 0;

@@ -1195,7 +1195,7 @@ namespace Ryujinx.Graphics.OpenGL
            _framebuffer.SetDrawBuffers(colors.Length);
        }

-        public void SetScissors(ReadOnlySpan<Rectangle<int>> regions)
+        public void SetScissors(ReadOnlySpan<Rectangle<int>> regions, bool signalChange = true)
        {
            int count = Math.Min(regions.Length, Constants.MaxViewports);

@@ -1388,7 +1388,7 @@ namespace Ryujinx.Graphics.OpenGL
            _vertexArray.SetVertexBuffers(vertexBuffers);
        }

-        public void SetViewports(ReadOnlySpan<Viewport> viewports)
+        public void SetViewports(ReadOnlySpan<Viewport> viewports, bool signalChange = true)
        {
            Array.Resize(ref _viewportArray, viewports.Length * 4);
            Array.Resize(ref _depthRangeArray, viewports.Length * 2);
@@ -1537,6 +1537,11 @@ namespace Ryujinx.Graphics.OpenGL
        {
            DrawCount++;

+            if (!_framebuffer.HasAttachments && _viewportArray.Length >= 4)
+            {
+                _framebuffer.SetDefaultSize((int)_viewportArray[2], (int)_viewportArray[3]);
+            }
+
            _unit0Texture?.Bind(0);
        }

@@ -0,0 +1,12 @@
+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);
+        }
+    }
+}
@@ -0,0 +1,100 @@
+// 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,
+    }
+}
@@ -0,0 +1,83 @@
+
+// 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,
+    }
+}
@@ -0,0 +1,39 @@
+// 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
+    }
+}
@@ -0,0 +1,5 @@
+# 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.
@@ -0,0 +1,639 @@
+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
+    }
+}
@@ -0,0 +1,51 @@
+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
+}
@@ -0,0 +1,16 @@
+
+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);
+        }
+    }
+}
@@ -0,0 +1,47 @@
+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);
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>disable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>
+</Project>
@@ -1790,7 +1790,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
                    {
                        (_, varType) = IoMap.GetSpirvBuiltIn(ioVariable);

-                        if (IoMap.IsPerVertexBuiltIn(ioVariable))
+                        if (context.Definitions.Stage.IsVtg() && IoMap.IsPerVertexBuiltIn(ioVariable))
                        {
                            perVertexBuiltIn = ioVariable;
                            ioVariable = IoVariable.Position;
@@ -70,19 +70,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations

            Operand bindlessHandle = texOp.GetSource(0);

-            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))
+            if (!IsBindlessAccessAllowed(bindlessHandle))
            {
                return false;
            }
@@ -100,7 +88,10 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations

            texOp.SetSource(0, textureIndex);

-            bool hasSampler = !texOp.Inst.IsImage();
+            // 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;

            SetBindingPair textureSetAndBinding = resourceManager.GetTextureOrImageBinding(
                texOp.Inst,
@@ -143,26 +134,112 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations

        private static bool IsBindlessAccessAllowed(Operand bindlessHandle)
        {
-            if (bindlessHandle.Type == OperandType.ConstantBuffer)
-            {
-                // Bindless access with handles from constant buffer is allowed.
+            // 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;

-                return true;
+            Stack<(Operand Operand, int Depth)> work = new();
+            HashSet<Operand> visited = new();
+
+            work.Push((bindlessHandle, 0));
+
+            while (work.Count != 0 && visited.Count < MaxVisitedOperands)
+            {
+                (Operand operand, int depth) = work.Pop();
+
+                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));
+                }
            }

-            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.
+            return false;
+        }

-                return false;
-            }
-
-            return true;
+        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;
        }

        private static bool TryConvertBindless(BasicBlock block, ResourceManager resourceManager, IGpuAccessor gpuAccessor, TextureOperation texOp)
@@ -255,8 +255,8 @@ namespace Ryujinx.Graphics.Vulkan.Effects

            scissors[0] = new Rectangle<int>(0, 0, texture.Width, texture.Height);

-            _pipeline.SetRenderTarget(texture, (uint)texture.Width, (uint)texture.Height);
-            _pipeline.SetRenderTargetColorMasks(colorMasks);
+            _pipeline.SetRenderTarget(texture, (uint)texture.Width, (uint)texture.Height, false);
+            _pipeline.SetRenderTargetColorMasks(colorMasks, false);
            _pipeline.SetScissors(scissors);
            _pipeline.ClearRenderTargetColor(0, 0, 1, new ColorF(0f, 0f, 0f, 1f));
        }
@@ -238,6 +238,7 @@ namespace Ryujinx.Graphics.Vulkan
                Face.Back => CullModeFlags.BackBit,
                Face.Front => CullModeFlags.FrontBit,
                Face.FrontAndBack => CullModeFlags.FrontAndBack,
+                Face.None => CullModeFlags.None,
                _ => LogInvalidAndReturn(face, nameof(Face), CullModeFlags.BackBit),
            };
        }
@@ -310,6 +311,25 @@ namespace Ryujinx.Graphics.Vulkan
            };
        }

+        public static PrimitiveTopology ConvertToClass(this PrimitiveTopology topology)
+        {
+            return topology switch
+            {
+                PrimitiveTopology.PointList => PrimitiveTopology.PointList,
+                PrimitiveTopology.LineList or
+                    PrimitiveTopology.LineStrip or
+                    PrimitiveTopology.LineListWithAdjacency or
+                    PrimitiveTopology.LineStripWithAdjacency => PrimitiveTopology.LineList,
+                PrimitiveTopology.TriangleList or
+                    PrimitiveTopology.TriangleStrip or
+                    PrimitiveTopology.TriangleFan or
+                    PrimitiveTopology.TriangleListWithAdjacency or
+                    PrimitiveTopology.TriangleStripWithAdjacency => PrimitiveTopology.TriangleStrip,
+                PrimitiveTopology.PatchList => PrimitiveTopology.PatchList,
+                _ => LogInvalidAndReturn(topology, nameof(PrimitiveTopology), PrimitiveTopology.TriangleStrip),
+            };
+        }
+
        public static StencilOp Convert(this GAL.StencilOp op)
        {
            return op switch
@@ -32,6 +32,29 @@ 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;
@@ -31,6 +31,7 @@ namespace Ryujinx.Graphics.Vulkan
        public readonly bool SupportsShaderStorageImageMultisample;
        public readonly bool SupportsConditionalRendering;
        public readonly bool SupportsExtendedDynamicState;
+        public readonly PhysicalDeviceExtendedDynamicState2FeaturesEXT SupportsExtendedDynamicState2;
        public readonly bool SupportsMultiView;
        public readonly bool SupportsNullDescriptors;
        public readonly bool SupportsPushDescriptors;
@@ -46,6 +47,7 @@ namespace Ryujinx.Graphics.Vulkan
        public readonly bool SupportsViewportArray2;
        public readonly bool SupportsHostImportedMemory;
        public readonly bool SupportsDepthClipControl;
+        public readonly bool SupportsWideLines;
        public readonly bool SupportsAttachmentFeedbackLoop;
        public readonly bool SupportsDynamicAttachmentFeedbackLoop;
        public readonly uint SubgroupSize;
@@ -54,6 +56,7 @@ namespace Ryujinx.Graphics.Vulkan
        public readonly uint VertexBufferAlignment;
        public readonly uint SubTexelPrecisionBits;
        public readonly ulong MinResourceAlignment;
+        public readonly uint MaxTessellationPatchSize;
        public readonly ulong MinTexelBufferAlignment;

        public HardwareCapabilities(
@@ -72,6 +75,8 @@ namespace Ryujinx.Graphics.Vulkan
            bool supportsShaderStorageImageMultisample,
            bool supportsConditionalRendering,
            bool supportsExtendedDynamicState,
+            PhysicalDeviceExtendedDynamicState2FeaturesEXT supportsExtendedDynamicState2,
+            uint maxTessellationPatchSize,
            bool supportsMultiView,
            bool supportsNullDescriptors,
            bool supportsPushDescriptors,
@@ -87,6 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
            bool supportsViewportArray2,
            bool supportsHostImportedMemory,
            bool supportsDepthClipControl,
+            bool supportsWideLines,
            bool supportsAttachmentFeedbackLoop,
            bool supportsDynamicAttachmentFeedbackLoop,
            uint subgroupSize,
@@ -112,6 +118,8 @@ namespace Ryujinx.Graphics.Vulkan
            SupportsShaderStorageImageMultisample = supportsShaderStorageImageMultisample;
            SupportsConditionalRendering = supportsConditionalRendering;
            SupportsExtendedDynamicState = supportsExtendedDynamicState;
+            SupportsExtendedDynamicState2 = supportsExtendedDynamicState2;
+            MaxTessellationPatchSize = maxTessellationPatchSize;
            SupportsMultiView = supportsMultiView;
            SupportsNullDescriptors = supportsNullDescriptors;
            SupportsPushDescriptors = supportsPushDescriptors;
@@ -127,6 +135,7 @@ namespace Ryujinx.Graphics.Vulkan
            SupportsViewportArray2 = supportsViewportArray2;
            SupportsHostImportedMemory = supportsHostImportedMemory;
            SupportsDepthClipControl = supportsDepthClipControl;
+            SupportsWideLines = supportsWideLines;
            SupportsAttachmentFeedbackLoop = supportsAttachmentFeedbackLoop;
            SupportsDynamicAttachmentFeedbackLoop = supportsDynamicAttachmentFeedbackLoop;
            SubgroupSize = subgroupSize;
@@ -406,20 +406,20 @@ namespace Ryujinx.Graphics.Vulkan

            if (dstIsDepthOrStencil)
            {
-                _pipeline.SetProgram(src.Info.Target.IsMultisample() ? _programDepthBlitMs : _programDepthBlit);
-                _pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
+                _pipeline.SetProgram(src.Info.Target.IsMultisample ? _programDepthBlitMs : _programDepthBlit, false);
+                _pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always), false);
            }
-            else if (src.Info.Target.IsMultisample())
+            else if (src.Info.Target.IsMultisample)
            {
-                _pipeline.SetProgram(_programColorBlitMs);
+                _pipeline.SetProgram(_programColorBlitMs, false);
            }
            else if (clearAlpha)
            {
-                _pipeline.SetProgram(_programColorBlitClearAlpha);
+                _pipeline.SetProgram(_programColorBlitClearAlpha, false);
            }
            else
            {
-                _pipeline.SetProgram(_programColorBlit);
+                _pipeline.SetProgram(_programColorBlit, false);
            }

            int dstWidth = dst.Width;
@@ -434,7 +434,7 @@ namespace Ryujinx.Graphics.Vulkan
                _pipeline.ClearRenderTargetColor(0, 0, 1, new ColorF(0f, 0f, 0f, 1f));
            }

-            _pipeline.SetViewports(viewports);
+            _pipeline.SetViewports(viewports, false);
            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
            _pipeline.Draw(4, 1, 0, 0);

@@ -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, false);
                _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, false);
                _pipeline.SetStencilTest(CreateStencilTestDescriptor(true));
            }

@@ -771,8 +771,8 @@ namespace Ryujinx.Graphics.Vulkan
                0f,
                1f);

-            pipeline.SetProgram(_programColorBlit);
-            pipeline.SetViewports(viewports);
+            pipeline.SetProgram(_programColorBlit, false);
+            pipeline.SetViewports(viewports, false);
            pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
            pipeline.Draw(4, 1, 0, 0);

@@ -1229,7 +1229,7 @@ namespace Ryujinx.Graphics.Vulkan
                    TextureView srcView = Create2DLayerView(src, srcLayer + z, 0);
                    TextureView dstView = Create2DLayerView(dst, dstLayer + z, 0);

-                    _pipeline.SetRenderTarget(dstView, (uint)dst.Width, (uint)dst.Height);
+                    _pipeline.SetRenderTarget(dstView, (uint)dst.Width, (uint)dst.Height, false);

                    CopyMSDraw(srcView, aspectFlags, fromMS: false);

@@ -1246,7 +1246,7 @@ namespace Ryujinx.Graphics.Vulkan
            }
            else
            {
-                _pipeline.SetProgram(_programColorDrawToMs);
+                _pipeline.SetProgram(_programColorDrawToMs, false);

                Format format = GetFormat(src.Info.BytesPerPixel);
                VkFormat vkFormat = FormatTable.GetFormat(format);
@@ -1323,12 +1323,12 @@ namespace Ryujinx.Graphics.Vulkan

            if (isDepth)
            {
-                _pipeline.SetProgram(fromMS ? _programDepthDrawToNonMs : _programDepthDrawToMs);
+                _pipeline.SetProgram(fromMS ? _programDepthDrawToNonMs : _programDepthDrawToMs, false);
                _pipeline.SetDepthTest(new DepthTestDescriptor(true, true, CompareOp.Always));
            }
            else
            {
-                _pipeline.SetProgram(fromMS ? _programStencilDrawToNonMs : _programStencilDrawToMs);
+                _pipeline.SetProgram(fromMS ? _programStencilDrawToNonMs : _programStencilDrawToMs, false);
                _pipeline.SetStencilTest(CreateStencilTestDescriptor(true));
            }

@@ -0,0 +1,32 @@
+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)));
+        }
+    }
+}
@@ -76,6 +76,7 @@ namespace Ryujinx.Graphics.Vulkan
        private readonly BufferState[] _transformFeedbackBuffers;
        private readonly VertexBufferState[] _vertexBuffers;
        private ulong _vertexBuffersDirty;
+        private bool _bindingsSet;
        protected Rectangle<int> ClearScissor;

        private readonly VertexBufferUpdater _vertexBufferUpdater;
@@ -89,6 +90,9 @@ namespace Ryujinx.Graphics.Vulkan
        private bool _tfEnabled;
        private bool _tfActive;

+        private readonly bool _supportExtDynamic;
+        private readonly bool _supportExtDynamic2;
+
        private FeedbackLoopAspects _feedbackLoop;
        private bool _passWritesDepthStencil;

@@ -96,6 +100,8 @@ namespace Ryujinx.Graphics.Vulkan
        public ulong DrawCount { get; private set; }
        public bool RenderPassActive { get; private set; }

+        private readonly int[] _vertexBufferBindings;
+
        public unsafe PipelineBase(VulkanRenderer gd, Device device)
        {
            Gd = gd;
@@ -128,7 +134,19 @@ namespace Ryujinx.Graphics.Vulkan

            _storedBlend = new PipelineColorBlendAttachmentState[Constants.MaxRenderTargets];

-            _newState.Initialize();
+            _supportExtDynamic = gd.Capabilities.SupportsExtendedDynamicState;
+
+            _supportExtDynamic2 = gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2;
+
+            _bindingsSet = false;
+
+            _vertexBufferBindings = new int[Constants.MaxVertexBuffers];
+            for (int i = 0; i < Constants.MaxVertexBuffers; i++)
+            {
+                _vertexBufferBindings[i] = i + 1;
+            }
+
+            _newState.Initialize(gd.Capabilities);
        }

        public void Initialize()
@@ -634,19 +652,46 @@ namespace Ryujinx.Graphics.Vulkan
        {
            if (texture is TextureView srcTexture)
            {
-                CullModeFlags oldCullMode = _newState.CullMode;
-                bool oldStencilTestEnable = _newState.StencilTestEnable;
-                bool oldDepthTestEnable = _newState.DepthTestEnable;
-                bool oldDepthWriteEnable = _newState.DepthWriteEnable;
+                CullModeFlags oldCullMode;
+                bool oldStencilTestEnable;
+                bool oldDepthTestEnable;
+                bool oldDepthWriteEnable;
+                PrimitiveTopology oldTopology;
                Array16<Silk.NET.Vulkan.Viewport> oldViewports = DynamicState.Viewports;
-                uint oldViewportsCount = _newState.ViewportsCount;
-                PrimitiveTopology oldTopology = _topology;
+                uint oldViewportsCount;

-                _newState.CullMode = CullModeFlags.None;
-                _newState.StencilTestEnable = false;
-                _newState.DepthTestEnable = false;
-                _newState.DepthWriteEnable = false;
-                SignalStateChange();
+                if (_supportExtDynamic)
+                {
+                    oldCullMode = DynamicState.CullMode;
+                    oldStencilTestEnable = DynamicState.StencilTestEnable;
+                    oldDepthTestEnable = DynamicState.DepthTestEnable;
+                    oldDepthWriteEnable = DynamicState.DepthWriteEnable;
+                    oldTopology = _topology;
+                    oldViewportsCount = DynamicState.ViewportsCount;
+                }
+                else
+                {
+                    oldCullMode = _newState.CullMode;
+                    oldStencilTestEnable = _newState.StencilTestEnable;
+                    oldDepthTestEnable = _newState.DepthTestEnable;
+                    oldDepthWriteEnable = _newState.DepthWriteEnable;
+                    oldTopology = _topology;
+                    oldViewportsCount = _newState.ViewportsCount;
+                }
+
+                if (_supportExtDynamic)
+                {
+                    DynamicState.SetCullMode(CullModeFlags.None);
+                    DynamicState.SetDepthTestBool(false, false);
+                    DynamicState.SetStencilTest(false);
+                }
+                else
+                {
+                    _newState.CullMode = CullModeFlags.None;
+                    _newState.StencilTestEnable = false;
+                    _newState.DepthTestEnable = false;
+                    _newState.DepthWriteEnable = false;
+                }

                Gd.HelperShader.DrawTexture(
                    Gd,
@@ -656,16 +701,24 @@ namespace Ryujinx.Graphics.Vulkan
                    srcRegion,
                    dstRegion);

-                _newState.CullMode = oldCullMode;
-                _newState.StencilTestEnable = oldStencilTestEnable;
-                _newState.DepthTestEnable = oldDepthTestEnable;
-                _newState.DepthWriteEnable = oldDepthWriteEnable;
+                if (_supportExtDynamic)
+                {
+                    DynamicState.SetCullMode(oldCullMode);
+                    DynamicState.SetStencilTest(oldStencilTestEnable);
+                    DynamicState.SetDepthTestBool(oldDepthTestEnable, oldDepthWriteEnable);
+                }
+                else
+                {
+                    _newState.CullMode = oldCullMode;
+                    _newState.StencilTestEnable = oldStencilTestEnable;
+                    _newState.DepthTestEnable = oldDepthTestEnable;
+                    _newState.DepthWriteEnable = oldDepthWriteEnable;
+                    _newState.ViewportsCount = oldViewportsCount;
+                }
+
                SetPrimitiveTopology(oldTopology);

                DynamicState.SetViewports(ref oldViewports, oldViewportsCount);
-
-                _newState.ViewportsCount = oldViewportsCount;
-                SignalStateChange();
            }
        }

@@ -796,53 +849,112 @@ namespace Ryujinx.Graphics.Vulkan

        public void SetDepthBias(PolygonModeMask enables, float factor, float units, float clamp)
        {
-            DynamicState.SetDepthBias(factor, units, clamp);
+            bool depthBiasEnable = (enables != 0) && (factor != 0 && units != 0);
+            bool changed = false;

-            _newState.DepthBiasEnable = enables != 0;
-            SignalStateChange();
-        }
+            if (_supportExtDynamic2)
+            {
+                DynamicState.SetDepthBiasEnable(depthBiasEnable);
+            }
+            else if (_newState.DepthBiasEnable != depthBiasEnable)
+            {
+                _newState.DepthBiasEnable = depthBiasEnable;
+                changed = true;
+            }

-        public void SetDepthClamp(bool clamp)
-        {
-            _newState.DepthClampEnable = clamp;
-            SignalStateChange();
-        }
+            if (depthBiasEnable)
+            {
+                DynamicState.SetDepthBias(factor, units, clamp);
+            }

-        public void SetDepthMode(DepthMode mode)
-        {
-            bool oldMode = _newState.DepthMode;
-            _newState.DepthMode = mode == DepthMode.MinusOneToOne;
-            if (_newState.DepthMode != oldMode)
+            if (changed)
            {
                SignalStateChange();
            }
        }

-        public void SetDepthTest(DepthTestDescriptor depthTest)
+        public void SetDepthClamp(bool clamp)
        {
-            _newState.DepthTestEnable = depthTest.TestEnable;
-            _newState.DepthWriteEnable = depthTest.WriteEnable;
-            _newState.DepthCompareOp = depthTest.Func.Convert();
+            _newState.DepthClampEnable = clamp;

-            UpdatePassDepthStencil();
            SignalStateChange();
        }

-        public void SetFaceCulling(bool enable, Face face)
+        public void SetDepthMode(DepthMode mode)
        {
-            _newState.CullMode = enable ? face.Convert() : CullModeFlags.None;
+            bool newMode = mode == DepthMode.MinusOneToOne;
+
+            if (_newState.DepthMode == newMode)
+            {
+                return;
+            }
+
+            _newState.DepthMode = newMode;
+
            SignalStateChange();
        }

+        public void SetDepthTest(DepthTestDescriptor depthTest, bool signalChange = true)
+        {
+            if (_supportExtDynamic)
+            {
+                DynamicState.SetDepthTestBool(depthTest.TestEnable, depthTest.WriteEnable);
+                if (depthTest.TestEnable)
+                {
+                    DynamicState.SetDepthTestCompareOp(depthTest.Func.Convert());
+                }
+            }
+            else
+            {
+                _newState.DepthTestEnable = depthTest.TestEnable;
+                _newState.DepthWriteEnable = depthTest.WriteEnable;
+                _newState.DepthCompareOp = depthTest.Func.Convert();
+
+                if (signalChange)
+                {
+                    SignalStateChange();
+                }
+            }
+
+            UpdatePassDepthStencil();
+        }
+
+        public void SetFaceCulling(Face face)
+        {
+            if (_supportExtDynamic)
+            {
+                DynamicState.SetCullMode(face.Convert());
+            }
+            else
+            {
+                _newState.CullMode = face.Convert();
+
+                SignalStateChange();
+            }
+        }
+
        public void SetFrontFace(FrontFace frontFace)
        {
-            _newState.FrontFace = frontFace.Convert();
-            SignalStateChange();
+            if (_supportExtDynamic)
+            {
+                DynamicState.SetFrontFace(frontFace.Convert());
+            }
+            else
+            {
+                _newState.FrontFace = frontFace.Convert();
+
+                SignalStateChange();
+            }
        }

        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)
@@ -876,28 +988,56 @@ namespace Ryujinx.Graphics.Vulkan

        public void SetLineParameters(float width, bool smooth)
        {
-            _newState.LineWidth = width;
-            SignalStateChange();
+            if (!Gd.IsMoltenVk)
+            {
+                DynamicState.SetLineWidth(Gd.Capabilities.SupportsWideLines ? width : 1.0f);
+            }
        }

        public void SetLogicOpState(bool enable, LogicalOp op)
        {
+            // Vendors other than NVIDIA have a bug where it enables logical operations even for float formats,
+            // so we need to force disable them here.
+            bool logicOpEnable = enable && (Gd.Vendor == Vendor.Nvidia || _newState.Internal.LogicOpsAllowed);
+
            _newState.LogicOpEnable = enable;
-            _newState.LogicOp = op.Convert();
+
+            if (Gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2LogicOp)
+            {
+                if (logicOpEnable)
+                {
+                    DynamicState.SetLogicOp(op.Convert());
+                }
+            }
+            else
+            {
+                _newState.LogicOp = op.Convert();
+            }
+
            SignalStateChange();
        }

        public void SetMultisampleState(MultisampleDescriptor multisample)
        {
            _newState.AlphaToCoverageEnable = multisample.AlphaToCoverageEnable;
+
            _newState.AlphaToOneEnable = multisample.AlphaToOneEnable;
+
            SignalStateChange();
        }

        public void SetPatchParameters(int vertices, ReadOnlySpan<float> defaultOuterLevel, ReadOnlySpan<float> defaultInnerLevel)
        {
-            _newState.PatchControlPoints = (uint)vertices;
-            SignalStateChange();
+            if (Gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
+            {
+                DynamicState.SetPatchControlPoints((uint)vertices);
+            }
+            else
+            {
+                _newState.PatchControlPoints = (uint)vertices;
+
+                SignalStateChange();
+            }

            // TODO: Default levels (likely needs emulation on shaders?)
        }
@@ -914,12 +1054,21 @@ namespace Ryujinx.Graphics.Vulkan

        public void SetPrimitiveRestart(bool enable, int index)
        {
-            _newState.PrimitiveRestartEnable = enable;
+            if (_supportExtDynamic2)
+            {
+                DynamicState.SetPrimitiveRestartEnable(enable);
+            }
+            else
+            {
+                _newState.PrimitiveRestartEnable = enable;
+
+                SignalStateChange();
+            }
+
            // TODO: What to do about the index?
-            SignalStateChange();
        }

-        public void SetPrimitiveTopology(PrimitiveTopology topology)
+        public void SetPrimitiveTopology(PrimitiveTopology topology, bool signalChange = true)
        {
            _topology = topology;

@@ -927,10 +1076,18 @@ namespace Ryujinx.Graphics.Vulkan

            _newState.Topology = vkTopology;

-            SignalStateChange();
+            if (_supportExtDynamic)
+            {
+                DynamicState.SetPrimitiveTopology(vkTopology);
+            }
+
+            if (signalChange)
+            {
+                SignalStateChange();
+            }
        }

-        public void SetProgram(IProgram program)
+        public void SetProgram(IProgram program, bool signalChange = true)
        {
            ShaderCollection internalProgram = (ShaderCollection)program;
            PipelineShaderStageCreateInfo[] stages = internalProgram.GetInfos();
@@ -946,7 +1103,10 @@ namespace Ryujinx.Graphics.Vulkan

            stages.CopyTo(_newState.Stages.AsSpan()[..stages.Length]);

-            SignalStateChange();
+            if (signalChange)
+            {
+                SignalStateChange();
+            }

            if (internalProgram.IsCompute)
            {
@@ -972,18 +1132,26 @@ namespace Ryujinx.Graphics.Vulkan

        public void SetRasterizerDiscard(bool discard)
        {
-            _newState.RasterizerDiscardEnable = discard;
-            SignalStateChange();
+            if (_supportExtDynamic2)
+            {
+                DynamicState.SetRasterizerDiscard(discard);
+            }
+            else
+            {
+                _newState.RasterizerDiscardEnable = discard;
+
+                SignalStateChange();
+            }

            if (!discard && Gd.IsQualcommProprietary)
            {
                // On Adreno, enabling rasterizer discard somehow corrupts the viewport state.
                // Force it to be updated on next use to work around this bug.
-                DynamicState.ForceAllDirty();
+                DynamicState.ForceAllDirty(Gd);
            }
        }

-        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask)
+        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask, bool signalChange = true)
        {
            int count = Math.Min(Constants.MaxRenderTargets, componentMask.Length);
            int writtenAttachments = 0;
@@ -1025,7 +1193,10 @@ namespace Ryujinx.Graphics.Vulkan
            }
            else
            {
-                SignalStateChange();
+                if (signalChange)
+                {
+                    SignalStateChange();
+                }

                if (writtenAttachments != _writtenAttachmentCount)
                {
@@ -1049,7 +1220,7 @@ namespace Ryujinx.Graphics.Vulkan
            SetRenderTargetsInternal(colors, depthStencil, Gd.IsTBDR);
        }

-        public void SetScissors(ReadOnlySpan<Rectangle<int>> regions)
+        public void SetScissors(ReadOnlySpan<Rectangle<int>> regions, bool signalChange = true)
        {
            int maxScissors = Gd.Capabilities.SupportsMultiView ? Constants.MaxViewports : 1;
            int count = Math.Min(maxScissors, regions.Length);
@@ -1058,6 +1229,8 @@ namespace Ryujinx.Graphics.Vulkan
                ClearScissor = regions[0];
            }

+            DynamicState.ScissorsCount = count;
+
            for (int i = 0; i < count; i++)
            {
                Rectangle<int> region = regions[i];
@@ -1067,34 +1240,56 @@ namespace Ryujinx.Graphics.Vulkan
                DynamicState.SetScissor(i, new Rect2D(offset, extent));
            }

-            DynamicState.ScissorsCount = count;
+            if (!_supportExtDynamic)
+            {
+                _newState.ScissorsCount = (uint)count;

-            _newState.ScissorsCount = (uint)count;
-            SignalStateChange();
+                if (signalChange)
+                {
+                    SignalStateChange();
+                }
+            }
        }

        public void SetStencilTest(StencilTestDescriptor stencilTest)
        {
-            DynamicState.SetStencilMasks(
-                (uint)stencilTest.BackFuncMask,
+            if (_supportExtDynamic)
+            {
+                DynamicState.SetStencilTestandOp(
+                    stencilTest.BackSFail.Convert(),
+                    stencilTest.BackDpPass.Convert(),
+                    stencilTest.BackDpFail.Convert(),
+                    stencilTest.BackFunc.Convert(),
+                    stencilTest.FrontSFail.Convert(),
+                    stencilTest.FrontDpPass.Convert(),
+                    stencilTest.FrontDpFail.Convert(),
+                    stencilTest.FrontFunc.Convert(),
+                    stencilTest.TestEnable);
+
+                UpdatePassDepthStencil();
+            }
+            else
+            {
+                _newState.StencilBackFailOp = stencilTest.BackSFail.Convert();
+                _newState.StencilBackPassOp = stencilTest.BackDpPass.Convert();
+                _newState.StencilBackDepthFailOp = stencilTest.BackDpFail.Convert();
+                _newState.StencilBackCompareOp = stencilTest.BackFunc.Convert();
+                _newState.StencilFrontFailOp = stencilTest.FrontSFail.Convert();
+                _newState.StencilFrontPassOp = stencilTest.FrontDpPass.Convert();
+                _newState.StencilFrontDepthFailOp = stencilTest.FrontDpFail.Convert();
+                _newState.StencilFrontCompareOp = stencilTest.FrontFunc.Convert();
+                _newState.StencilTestEnable = stencilTest.TestEnable;
+
+                UpdatePassDepthStencil();
+                SignalStateChange();
+            }
+
+            DynamicState.SetStencilMask((uint)stencilTest.BackFuncMask,
                (uint)stencilTest.BackMask,
                (uint)stencilTest.BackFuncRef,
                (uint)stencilTest.FrontFuncMask,
                (uint)stencilTest.FrontMask,
                (uint)stencilTest.FrontFuncRef);
-
-            _newState.StencilTestEnable = stencilTest.TestEnable;
-            _newState.StencilBackFailOp = stencilTest.BackSFail.Convert();
-            _newState.StencilBackPassOp = stencilTest.BackDpPass.Convert();
-            _newState.StencilBackDepthFailOp = stencilTest.BackDpFail.Convert();
-            _newState.StencilBackCompareOp = stencilTest.BackFunc.Convert();
-            _newState.StencilFrontFailOp = stencilTest.FrontSFail.Convert();
-            _newState.StencilFrontPassOp = stencilTest.FrontDpPass.Convert();
-            _newState.StencilFrontDepthFailOp = stencilTest.FrontDpFail.Convert();
-            _newState.StencilFrontCompareOp = stencilTest.FrontFunc.Convert();
-
-            UpdatePassDepthStencil();
-            SignalStateChange();
        }

        public void SetStorageBuffers(ReadOnlySpan<BufferAssignment> buffers)
@@ -1215,12 +1410,24 @@ namespace Ryujinx.Graphics.Vulkan
        {
            int count = Math.Min(Constants.MaxVertexBuffers, vertexBuffers.Length);

-            _newState.Internal.VertexBindingDescriptions[0] = new VertexInputBindingDescription(0, 0, VertexInputRate.Vertex);
-
            int validCount = 1;

+            if (!_bindingsSet)
+            {
+                _newState.Internal.VertexBindingDescriptions[0] = new VertexInputBindingDescription(0, _supportExtDynamic && (!Gd.IsMoltenVk || Gd.SupportsMTL31) ? null : 0, VertexInputRate.Vertex);
+
+                for (int i = 1; i < count; i++)
+                {
+                    _newState.Internal.VertexBindingDescriptions[i] = new VertexInputBindingDescription((uint)i);
+                }
+
+                _bindingsSet = true;
+            }
+
            BufferHandle lastHandle = default;
            Auto<DisposableBuffer> lastBuffer = null;
+            bool vertexBindingDescriptionChanged = false;
+            bool vertexDescriptionCountChanged = false;

            for (int i = 0; i < count; i++)
            {
@@ -1239,13 +1446,32 @@ namespace Ryujinx.Graphics.Vulkan

                    if (vb != null)
                    {
-                        int binding = i + 1;
                        int descriptorIndex = validCount++;

-                        _newState.Internal.VertexBindingDescriptions[descriptorIndex] = new VertexInputBindingDescription(
-                            (uint)binding,
-                            (uint)vertexBuffer.Stride,
-                            inputRate);
+                        if (_supportExtDynamic && (!Gd.IsMoltenVk || Gd.SupportsMTL31))
+                        {
+                            if (_newState.Internal.VertexBindingDescriptions[descriptorIndex].InputRate != inputRate ||
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].Binding != _vertexBufferBindings[i])
+                            {
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].InputRate = inputRate;
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].Binding = (uint)_vertexBufferBindings[i];
+
+                                vertexBindingDescriptionChanged = true;
+                            }
+                        }
+                        else
+                        {
+                            if (_newState.Internal.VertexBindingDescriptions[descriptorIndex].InputRate != inputRate ||
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].Stride != vertexBuffer.Stride ||
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].Binding != _vertexBufferBindings[i])
+                            {
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].Binding = (uint)_vertexBufferBindings[i];
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].Stride = (uint)vertexBuffer.Stride;
+                                _newState.Internal.VertexBindingDescriptions[descriptorIndex].InputRate = inputRate;
+
+                                vertexBindingDescriptionChanged = true;
+                            }
+                        }

                        int vbSize = vertexBuffer.Buffer.Size;

@@ -1261,7 +1487,7 @@ namespace Ryujinx.Graphics.Vulkan
                            }
                        }

-                        ref VertexBufferState buffer = ref _vertexBuffers[binding];
+                        ref VertexBufferState buffer = ref _vertexBuffers[_vertexBufferBindings[i]];
                        int oldScalarAlign = buffer.AttributeScalarAlignment;

                        if (Gd.Capabilities.VertexBufferAlignment < 2 &&
@@ -1278,7 +1504,7 @@ namespace Ryujinx.Graphics.Vulkan
                                    vbSize,
                                    vertexBuffer.Stride);

-                                buffer.BindVertexBuffer(Gd, Cbs, (uint)binding, ref _newState, _vertexBufferUpdater);
+                                buffer.BindVertexBuffer(Gd, Cbs, (uint)_vertexBufferBindings[i], ref _newState, _vertexBufferUpdater);
                            }
                        }
                        else
@@ -1294,7 +1520,7 @@ namespace Ryujinx.Graphics.Vulkan
                                vbSize,
                                vertexBuffer.Stride);

-                            _vertexBuffersDirty |= 1UL << binding;
+                            _vertexBuffersDirty |= 1UL << _vertexBufferBindings[i];
                        }

                        buffer.AttributeScalarAlignment = oldScalarAlign;
@@ -1304,11 +1530,19 @@ namespace Ryujinx.Graphics.Vulkan

            _vertexBufferUpdater.Commit(Cbs);

-            _newState.VertexBindingDescriptionsCount = (uint)validCount;
-            SignalStateChange();
+            if (_newState.VertexBindingDescriptionsCount != validCount)
+            {
+                _newState.VertexBindingDescriptionsCount = (uint)validCount;
+                vertexDescriptionCountChanged = true;
+            }
+
+            if (vertexDescriptionCountChanged || vertexBindingDescriptionChanged)
+            {
+                SignalStateChange();
+            }
        }

-        public void SetViewports(ReadOnlySpan<Viewport> viewports)
+        public void SetViewports(ReadOnlySpan<Viewport> viewports, bool signalChange = true)
        {
            int maxViewports = Gd.Capabilities.SupportsMultiView ? Constants.MaxViewports : 1;
            int count = Math.Min(maxViewports, viewports.Length);
@@ -1333,8 +1567,15 @@ namespace Ryujinx.Graphics.Vulkan
                    Clamp(viewport.DepthFar)));
            }

-            _newState.ViewportsCount = (uint)count;
-            SignalStateChange();
+            if (!_supportExtDynamic)
+            {
+                _newState.ViewportsCount = (uint)count;
+
+                if (signalChange)
+                {
+                    SignalStateChange();
+                }
+            }
        }

        public void SwapBuffer(Auto<DisposableBuffer> from, Auto<DisposableBuffer> to)
@@ -1383,7 +1624,7 @@ namespace Ryujinx.Graphics.Vulkan
            _vertexBuffersDirty = ulong.MaxValue >> (64 - _vertexBuffers.Length);

            _descriptorSetUpdater.SignalCommandBufferChange();
-            DynamicState.ForceAllDirty();
+            DynamicState.ForceAllDirty(Gd);
            _currentPipelineHandle = 0;
        }

@@ -1541,8 +1782,9 @@ namespace Ryujinx.Graphics.Vulkan
                if (Gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop)
                {
                    DynamicState.SetFeedbackLoop(aspects);
+                    _newState.FeedbackLoopDynamicState = true;
                }
-                else
+                else if (Gd.Capabilities.SupportsAttachmentFeedbackLoop)
                {
                    _newState.FeedbackLoopAspects = aspects;
                }
@@ -1602,11 +1844,36 @@ namespace Ryujinx.Graphics.Vulkan
            }

            // Stencil test being enabled doesn't necessarily mean a write, but it's not critical to check.
-            _passWritesDepthStencil |= (_newState.DepthTestEnable && _newState.DepthWriteEnable) || _newState.StencilTestEnable;
+            if (_supportExtDynamic)
+            {
+                _passWritesDepthStencil |= (DynamicState.DepthTestEnable && DynamicState.DepthWriteEnable) || DynamicState.StencilTestEnable;
+            }
+            else
+            {
+                _passWritesDepthStencil |= (_newState.DepthTestEnable && _newState.DepthWriteEnable) || _newState.StencilTestEnable;
+            }
        }

        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();
@@ -5,6 +5,7 @@ using System;
 using VulkanFormat = Silk.NET.Vulkan.Format;
 using GALFormat = Ryujinx.Graphics.GAL.Format;
 using PolygonMode = Silk.NET.Vulkan.PolygonMode;
+using PrimitiveTopology = Ryujinx.Graphics.GAL.PrimitiveTopology;

 namespace Ryujinx.Graphics.Vulkan
 {
@@ -164,64 +165,84 @@ namespace Ryujinx.Graphics.Vulkan

        public static PipelineState ToVulkanPipelineState(this ProgramPipelineState state, VulkanRenderer gd)
        {
+            var extendedDynamicState2 = gd.Capabilities.SupportsExtendedDynamicState2;
+            var extendedDynamicState = gd.Capabilities.SupportsExtendedDynamicState;
+
            PipelineState pipeline = new();
-            pipeline.Initialize();
+            pipeline.Initialize(gd.Capabilities);

            // It is assumed that Dynamic State is enabled when this conversion is used.
-
-            pipeline.CullMode = state.CullEnable ? state.CullMode.Convert() : CullModeFlags.None;
-
            pipeline.DepthBoundsTestEnable = false; // Not implemented.

            pipeline.DepthClampEnable = state.DepthClampEnable;

-            pipeline.DepthTestEnable = state.DepthTest.TestEnable;
-            pipeline.DepthWriteEnable = state.DepthTest.WriteEnable;
-            pipeline.DepthCompareOp = state.DepthTest.Func.Convert();
+            pipeline.AlphaToCoverageEnable = state.AlphaToCoverageEnable;
+            pipeline.AlphaToOneEnable = state.AlphaToOneEnable;
+
            pipeline.DepthMode = state.DepthMode == DepthMode.MinusOneToOne;

-            pipeline.FrontFace = state.FrontFace.Convert();
-
            pipeline.HasDepthStencil = state.DepthStencilEnable;
-            pipeline.LineWidth = state.LineWidth;
-            pipeline.LogicOpEnable = state.LogicOpEnable;
-            pipeline.LogicOp = state.LogicOp.Convert();

-            pipeline.PatchControlPoints = state.PatchControlPoints;
            pipeline.PolygonMode = PolygonMode.Fill; // Not implemented.
-            pipeline.PrimitiveRestartEnable = state.PrimitiveRestartEnable;
-            pipeline.RasterizerDiscardEnable = state.RasterizerDiscard;
-            pipeline.SamplesCount = (uint)state.SamplesCount;
-
-            if (gd.Capabilities.SupportsMultiView)
-            {
-                pipeline.ScissorsCount = Constants.MaxViewports;
-                pipeline.ViewportsCount = Constants.MaxViewports;
-            }
-            else
-            {
-                pipeline.ScissorsCount = 1;
-                pipeline.ViewportsCount = 1;
-            }
-
-            pipeline.DepthBiasEnable = state.BiasEnable != 0;
-
-            // Stencil masks and ref are dynamic, so are 0 in the Vulkan pipeline.
-
-            pipeline.StencilFrontFailOp = state.StencilTest.FrontSFail.Convert();
-            pipeline.StencilFrontPassOp = state.StencilTest.FrontDpPass.Convert();
-            pipeline.StencilFrontDepthFailOp = state.StencilTest.FrontDpFail.Convert();
-            pipeline.StencilFrontCompareOp = state.StencilTest.FrontFunc.Convert();
-
-            pipeline.StencilBackFailOp = state.StencilTest.BackSFail.Convert();
-            pipeline.StencilBackPassOp = state.StencilTest.BackDpPass.Convert();
-            pipeline.StencilBackDepthFailOp = state.StencilTest.BackDpFail.Convert();
-            pipeline.StencilBackCompareOp = state.StencilTest.BackFunc.Convert();
-
-            pipeline.StencilTestEnable = state.StencilTest.TestEnable;

            pipeline.Topology = gd.TopologyRemap(state.Topology).Convert();

+            if (!extendedDynamicState)
+            {
+                pipeline.DepthCompareOp = state.DepthTest.Func.Convert();
+                pipeline.CullMode = state.CullMode.Convert();
+
+                pipeline.DepthTestEnable = state.DepthTest.TestEnable;
+                pipeline.DepthWriteEnable = state.DepthTest.WriteEnable;
+
+                pipeline.FrontFace = state.FrontFace.Convert();
+
+                if (gd.Capabilities.SupportsMultiView)
+                {
+                    pipeline.ScissorsCount = Constants.MaxViewports;
+                    pipeline.ViewportsCount = Constants.MaxViewports;
+                }
+                else
+                {
+                    pipeline.ScissorsCount = 1;
+                    pipeline.ViewportsCount = 1;
+                }
+
+                pipeline.StencilTestEnable = state.StencilTest.TestEnable;
+
+                pipeline.StencilFrontFailOp = state.StencilTest.FrontSFail.Convert();
+                pipeline.StencilFrontPassOp = state.StencilTest.FrontDpPass.Convert();
+                pipeline.StencilFrontDepthFailOp = state.StencilTest.FrontDpFail.Convert();
+                pipeline.StencilFrontCompareOp = state.StencilTest.FrontFunc.Convert();
+
+                pipeline.StencilBackFailOp = state.StencilTest.BackSFail.Convert();
+                pipeline.StencilBackPassOp = state.StencilTest.BackDpPass.Convert();
+                pipeline.StencilBackDepthFailOp = state.StencilTest.BackDpFail.Convert();
+                pipeline.StencilBackCompareOp = state.StencilTest.BackFunc.Convert();
+            }
+
+            if (!extendedDynamicState2.ExtendedDynamicState2)
+            {
+                pipeline.PrimitiveRestartEnable = state.PrimitiveRestartEnable;
+                pipeline.RasterizerDiscardEnable = state.RasterizerDiscard;
+                pipeline.DepthBiasEnable = (state.BiasEnable != 0) &&
+                    (state.DepthBiasFactor != 0 && state.DepthBiasUnits != 0);
+            }
+
+            if (!extendedDynamicState2.ExtendedDynamicState2LogicOp)
+            {
+                pipeline.LogicOp = state.LogicOp.Convert();
+            }
+
+            if (!extendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
+            {
+                pipeline.PatchControlPoints = state.PatchControlPoints;
+            }
+
+            pipeline.SamplesCount = (uint)state.SamplesCount;
+
+            pipeline.LogicOpEnable = state.LogicOpEnable;
+
            int vaCount = Math.Min(Constants.MaxVertexAttributes, state.VertexAttribCount);
            int vbCount = Math.Min(Constants.MaxVertexBuffers, state.VertexBufferCount);

@@ -247,7 +268,7 @@ namespace Ryujinx.Graphics.Vulkan
            }

            int descriptorIndex = 1;
-            pipeline.Internal.VertexBindingDescriptions[0] = new VertexInputBindingDescription(0, 0, VertexInputRate.Vertex);
+            pipeline.Internal.VertexBindingDescriptions[0] = new VertexInputBindingDescription(0, extendedDynamicState && (!gd.IsMoltenVk || gd.SupportsMTL31) ? null : 0, VertexInputRate.Vertex);

            Span<BufferPipelineDescriptor> vertexBuffersSpan = state.VertexBuffers.AsSpan();
            Span<VertexInputBindingDescription> vertexBindingDescriptionsSpan = pipeline.Internal.VertexBindingDescriptions.AsSpan();
@@ -270,7 +291,7 @@ namespace Ryujinx.Graphics.Vulkan
                    // TODO: Support divisor > 1
                    vertexBindingDescriptionsSpan[descriptorIndex++] = new VertexInputBindingDescription(
                        (uint)i + 1,
-                        (uint)alignedStride,
+                        extendedDynamicState && (!gd.IsMoltenVk || gd.SupportsMTL31) ? null : (uint)alignedStride,
                        inputRate);
                }
            }
@@ -2,6 +2,7 @@ using Ryujinx.Common.Memory;
 using Silk.NET.Vulkan;
 using Silk.NET.Vulkan.Extensions.EXT;
 using System;
+using System.Numerics;

 namespace Ryujinx.Graphics.Vulkan
 {
@@ -10,6 +11,7 @@ namespace Ryujinx.Graphics.Vulkan
        private float _depthBiasSlopeFactor;
        private float _depthBiasConstantFactor;
        private float _depthBiasClamp;
+        private bool _depthBiasEnable;

        public int ScissorsCount;
        private Array16<Rect2D> _scissors;
@@ -21,6 +23,23 @@ namespace Ryujinx.Graphics.Vulkan
        private uint _frontWriteMask;
        private uint _frontReference;

+        private StencilOp _backFailOp;
+        private StencilOp _backPassOp;
+        private StencilOp _backDepthFailOp;
+        private CompareOp _backCompareOp;
+        private StencilOp _frontFailOp;
+        private StencilOp _frontPassOp;
+        private StencilOp _frontDepthFailOp;
+        private CompareOp _frontCompareOp;
+
+        private float _lineWidth;
+
+        public bool StencilTestEnable;
+
+        public bool DepthTestEnable;
+        public bool DepthWriteEnable;
+        private CompareOp _depthCompareOp;
+
        private Array4<float> _blendConstants;

        private FeedbackLoopAspects _feedbackLoopAspects;
@@ -28,6 +47,19 @@ namespace Ryujinx.Graphics.Vulkan
        public uint ViewportsCount;
        public Array16<Viewport> Viewports;

+        public CullModeFlags CullMode;
+        private FrontFace _frontFace;
+
+        private bool _discard;
+
+        private LogicOp _logicOp;
+
+        private uint _patchControlPoints;
+
+        public PrimitiveTopology Topology;
+
+        private bool _primitiveRestartEnable;
+
        [Flags]
        private enum DirtyFlags
        {
@@ -38,7 +70,21 @@ namespace Ryujinx.Graphics.Vulkan
            Stencil = 1 << 3,
            Viewport = 1 << 4,
            FeedbackLoop = 1 << 5,
-            All = Blend | DepthBias | Scissor | Stencil | Viewport | FeedbackLoop,
+            CullMode = 1 << 6,
+            FrontFace = 1 << 7,
+            DepthTestBool = 1 << 8,
+            DepthTestCompareOp = 1 << 9,
+            StencilTestEnableAndStencilOp = 1 << 10,
+            LineWidth = 1 << 11,
+            RasterDiscard = 1 << 12,
+            LogicOp = 1 << 13,
+            PatchControlPoints = 1 << 14,
+            PrimitiveRestart = 1 << 15,
+            PrimitiveTopology = 1 << 16,
+            DepthBiasEnable = 1 << 17,
+            Standard = Blend | DepthBias | Scissor | Stencil | Viewport | FeedbackLoop,
+            Extended = CullMode | FrontFace | DepthTestBool | DepthTestCompareOp | StencilTestEnableAndStencilOp | PrimitiveTopology,
+            Extended2 = RasterDiscard | PrimitiveRestart | DepthBiasEnable,
        }

        private DirtyFlags _dirty;
@@ -49,7 +95,6 @@ namespace Ryujinx.Graphics.Vulkan
            _blendConstants[1] = g;
            _blendConstants[2] = b;
            _blendConstants[3] = a;
-
            _dirty |= DirtyFlags.Blend;
        }

@@ -62,15 +107,64 @@ namespace Ryujinx.Graphics.Vulkan
            _dirty |= DirtyFlags.DepthBias;
        }

+        public void SetDepthBiasEnable(bool enable)
+        {
+            _depthBiasEnable = enable;
+            _dirty |= DirtyFlags.DepthBiasEnable;
+        }
+
        public void SetScissor(int index, Rect2D scissor)
        {
            _scissors[index] = scissor;
-
            _dirty |= DirtyFlags.Scissor;
        }

-        public void SetStencilMasks(
-            uint backCompareMask,
+        public void SetDepthTestBool(bool testEnable, bool writeEnable)
+        {
+            DepthTestEnable = testEnable;
+            DepthWriteEnable = writeEnable;
+            _dirty |= DirtyFlags.DepthTestBool;
+        }
+
+        public void SetDepthTestCompareOp(CompareOp depthTestOp)
+        {
+            _depthCompareOp = depthTestOp;
+            _dirty |= DirtyFlags.DepthTestCompareOp;
+        }
+
+        public void SetStencilTestandOp(
+            StencilOp backFailOp,
+            StencilOp backPassOp,
+            StencilOp backDepthFailOp,
+            CompareOp backCompareOp,
+            StencilOp frontFailOp,
+            StencilOp frontPassOp,
+            StencilOp frontDepthFailOp,
+            CompareOp frontCompareOp,
+            bool stencilTestEnable)
+        {
+            _backFailOp = backFailOp;
+            _backPassOp = backPassOp;
+            _backDepthFailOp = backDepthFailOp;
+            _backCompareOp = backCompareOp;
+            _frontFailOp = frontFailOp;
+            _frontPassOp = frontPassOp;
+            _frontDepthFailOp = frontDepthFailOp;
+            _frontCompareOp = frontCompareOp;
+
+            StencilTestEnable = stencilTestEnable;
+
+            _dirty |= DirtyFlags.StencilTestEnableAndStencilOp;
+        }
+
+        public void SetStencilTest(bool stencilTestEnable)
+        {
+            StencilTestEnable = stencilTestEnable;
+
+            _dirty |= DirtyFlags.StencilTestEnableAndStencilOp;
+        }
+
+        public void SetStencilMask(uint backCompareMask,
            uint backWriteMask,
            uint backReference,
            uint frontCompareMask,
@@ -83,28 +177,46 @@ namespace Ryujinx.Graphics.Vulkan
            _frontCompareMask = frontCompareMask;
            _frontWriteMask = frontWriteMask;
            _frontReference = frontReference;
-
            _dirty |= DirtyFlags.Stencil;
        }

        public void SetViewport(int index, Viewport viewport)
        {
            Viewports[index] = viewport;
-
            _dirty |= DirtyFlags.Viewport;
        }

        public void SetViewports(ref Array16<Viewport> viewports, uint viewportsCount)
        {
-            Viewports = viewports;
-            ViewportsCount = viewportsCount;
-
-            if (ViewportsCount != 0)
+            if (!Viewports.Equals(viewports) || ViewportsCount != viewportsCount)
            {
-                _dirty |= DirtyFlags.Viewport;
+                Viewports = viewports;
+                ViewportsCount = viewportsCount;
+                if (ViewportsCount != 0)
+                {
+                    _dirty |= DirtyFlags.Viewport;
+                }
            }
        }

+        public void SetCullMode(CullModeFlags cullMode)
+        {
+            CullMode = cullMode;
+            _dirty |= DirtyFlags.CullMode;
+        }
+
+        public void SetFrontFace(FrontFace frontFace)
+        {
+            _frontFace = frontFace;
+            _dirty |= DirtyFlags.FrontFace;
+        }
+
+        public void SetLineWidth(float width)
+        {
+            _lineWidth = width;
+            _dirty |= DirtyFlags.LineWidth;
+        }
+
        public void SetFeedbackLoop(FeedbackLoopAspects aspects)
        {
            _feedbackLoopAspects = aspects;
@@ -112,43 +224,149 @@ namespace Ryujinx.Graphics.Vulkan
            _dirty |= DirtyFlags.FeedbackLoop;
        }

-        public void ForceAllDirty()
+        public void SetRasterizerDiscard(bool discard)
        {
-            _dirty = DirtyFlags.All;
+            _discard = discard;
+            _dirty |= DirtyFlags.RasterDiscard;
+        }
+
+        public void SetPrimitiveRestartEnable(bool primitiveRestart)
+        {
+            _primitiveRestartEnable = primitiveRestart;
+            _dirty |= DirtyFlags.PrimitiveRestart;
+        }
+
+        public void SetPrimitiveTopology(PrimitiveTopology primitiveTopology)
+        {
+            Topology = primitiveTopology;
+            _dirty |= DirtyFlags.PrimitiveTopology;
+        }
+
+        public void SetLogicOp(LogicOp op)
+        {
+            _logicOp = op;
+            _dirty |= DirtyFlags.LogicOp;
+        }
+
+        public void SetPatchControlPoints(uint points)
+        {
+            _patchControlPoints = points;
+            _dirty |= DirtyFlags.PatchControlPoints;
+        }
+
+        public void ForceAllDirty(VulkanRenderer gd)
+        {
+            _dirty = DirtyFlags.Standard;
+
+            if (gd.Capabilities.SupportsExtendedDynamicState)
+            {
+                _dirty |= DirtyFlags.Extended;
+            }
+
+            if (gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2)
+            {
+                _dirty |= DirtyFlags.Extended2;
+
+                if (gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2LogicOp)
+                {
+                    _dirty |= DirtyFlags.LogicOp;
+                }
+
+                if (gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
+                {
+                    _dirty |= DirtyFlags.PatchControlPoints;
+                }
+            }
+
+            if (!gd.IsMoltenVk)
+            {
+                _dirty |= DirtyFlags.LineWidth;
+            }
+
+            if (gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop)
+            {
+                _dirty |= DirtyFlags.FeedbackLoop;
+            }
        }

        public void ReplayIfDirty(VulkanRenderer gd, CommandBuffer commandBuffer)
        {
-            Vk api = gd.Api;
-
-            if (_dirty.HasFlag(DirtyFlags.Blend))
+            if (_dirty == DirtyFlags.None)
            {
-                RecordBlend(api, commandBuffer);
+                return;
            }

-            if (_dirty.HasFlag(DirtyFlags.DepthBias))
-            {
-                RecordDepthBias(api, commandBuffer);
-            }
+            var api = gd.Api;
+            var extendedStateApi = gd.ExtendedDynamicStateApi;
+            var extendedState2Api = gd.ExtendedDynamicState2Api;
+            var dynamicFeedbackLoopApi = gd.DynamicFeedbackLoopApi;

-            if (_dirty.HasFlag(DirtyFlags.Scissor))
-            {
-                RecordScissor(api, commandBuffer);
-            }
+            DirtyFlags dirtyFlags = _dirty;

-            if (_dirty.HasFlag(DirtyFlags.Stencil))
+            while (dirtyFlags != DirtyFlags.None)
            {
-                RecordStencilMasks(api, commandBuffer);
-            }
+                int bitIndex = BitOperations.TrailingZeroCount((uint)dirtyFlags);
+                DirtyFlags currentFlag = (DirtyFlags)(1 << bitIndex);

-            if (_dirty.HasFlag(DirtyFlags.Viewport))
-            {
-                RecordViewport(api, commandBuffer);
-            }
+                switch (currentFlag)
+                {
+                    case DirtyFlags.Blend:
+                        RecordBlend(api, commandBuffer);
+                        break;
+                    case DirtyFlags.DepthBias:
+                        RecordDepthBias(api, commandBuffer);
+                        break;
+                    case DirtyFlags.Scissor:
+                        RecordScissor(gd, commandBuffer);
+                        break;
+                    case DirtyFlags.Stencil:
+                        RecordStencil(api, commandBuffer);
+                        break;
+                    case DirtyFlags.Viewport:
+                        RecordViewport(gd, commandBuffer);
+                        break;
+                    case DirtyFlags.FeedbackLoop:
+                        RecordFeedbackLoop(dynamicFeedbackLoopApi, commandBuffer);
+                        break;
+                    case DirtyFlags.CullMode:
+                        RecordCullMode(extendedStateApi, commandBuffer);
+                        break;
+                    case DirtyFlags.FrontFace:
+                        RecordFrontFace(extendedStateApi, commandBuffer);
+                        break;
+                    case DirtyFlags.DepthTestBool:
+                        RecordDepthTestBool(extendedStateApi, commandBuffer);
+                        break;
+                    case DirtyFlags.DepthTestCompareOp:
+                        RecordDepthTestCompareOp(extendedStateApi, commandBuffer);
+                        break;
+                    case DirtyFlags.StencilTestEnableAndStencilOp:
+                        RecordStencilTestAndOp(extendedStateApi, commandBuffer);
+                        break;
+                    case DirtyFlags.LineWidth:
+                        RecordLineWidth(api, commandBuffer);
+                        break;
+                    case DirtyFlags.RasterDiscard:
+                        RecordRasterizationDiscard(extendedState2Api, commandBuffer);
+                        break;
+                    case DirtyFlags.LogicOp:
+                        RecordLogicOp(extendedState2Api, commandBuffer);
+                        break;
+                    case DirtyFlags.PatchControlPoints:
+                        RecordPatchControlPoints(extendedState2Api, commandBuffer);
+                        break;
+                    case DirtyFlags.PrimitiveRestart:
+                        RecordPrimitiveRestartEnable(gd, commandBuffer);
+                        break;
+                    case DirtyFlags.PrimitiveTopology:
+                        RecordPrimitiveTopology(extendedStateApi, commandBuffer);
+                        break;
+                    case DirtyFlags.DepthBiasEnable:
+                        RecordDepthBiasEnable(extendedState2Api, commandBuffer);
+                        break;
+                }

-            if (_dirty.HasFlag(DirtyFlags.FeedbackLoop) && gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop)
-            {
-                RecordFeedbackLoop(gd.DynamicFeedbackLoopApi, commandBuffer);
+                dirtyFlags &= ~currentFlag;
            }

            _dirty = DirtyFlags.None;
@@ -164,15 +382,27 @@ namespace Ryujinx.Graphics.Vulkan
            api.CmdSetDepthBias(commandBuffer, _depthBiasConstantFactor, _depthBiasClamp, _depthBiasSlopeFactor);
        }

-        private void RecordScissor(Vk api, CommandBuffer commandBuffer)
+        private readonly void RecordDepthBiasEnable(ExtExtendedDynamicState2 gd, CommandBuffer commandBuffer)
+        {
+            gd.CmdSetDepthBiasEnable(commandBuffer, _depthBiasEnable);
+        }
+
+        private void RecordScissor(VulkanRenderer gd, CommandBuffer commandBuffer)
        {
            if (ScissorsCount != 0)
            {
-                api.CmdSetScissor(commandBuffer, 0, (uint)ScissorsCount, _scissors.AsSpan());
+                if (gd.Capabilities.SupportsExtendedDynamicState)
+                {
+                    gd.ExtendedDynamicStateApi.CmdSetScissorWithCount(commandBuffer, (uint)ScissorsCount, _scissors.AsSpan());
+                }
+                else
+                {
+                    gd.Api.CmdSetScissor(commandBuffer, 0, (uint)ScissorsCount, _scissors.AsSpan());
+                }
            }
        }

-        private readonly void RecordStencilMasks(Vk api, CommandBuffer commandBuffer)
+        private readonly void RecordStencil(Vk api, CommandBuffer commandBuffer)
        {
            api.CmdSetStencilCompareMask(commandBuffer, StencilFaceFlags.FaceBackBit, _backCompareMask);
            api.CmdSetStencilWriteMask(commandBuffer, StencilFaceFlags.FaceBackBit, _backWriteMask);
@@ -182,12 +412,107 @@ namespace Ryujinx.Graphics.Vulkan
            api.CmdSetStencilReference(commandBuffer, StencilFaceFlags.FaceFrontBit, _frontReference);
        }

-        private void RecordViewport(Vk api, CommandBuffer commandBuffer)
+        private readonly void RecordStencilTestAndOp(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
        {
-            if (ViewportsCount != 0)
+            api.CmdSetStencilTestEnable(commandBuffer, StencilTestEnable);
+
+            api.CmdSetStencilOp(commandBuffer, StencilFaceFlags.FaceBackBit, _backFailOp, _backPassOp, _backDepthFailOp, _backCompareOp);
+            api.CmdSetStencilOp(commandBuffer, StencilFaceFlags.FaceFrontBit, _frontFailOp, _frontPassOp, _frontDepthFailOp, _frontCompareOp);
+        }
+
+        private void RecordViewport(VulkanRenderer gd, CommandBuffer commandBuffer)
+        {
+            if (ViewportsCount == 0)
            {
-                api.CmdSetViewport(commandBuffer, 0, ViewportsCount, Viewports.AsSpan());
+                return;
            }
+
+            if (gd.Capabilities.SupportsExtendedDynamicState)
+            {
+                gd.ExtendedDynamicStateApi.CmdSetViewportWithCount(commandBuffer, ViewportsCount, Viewports.AsSpan());
+            }
+            else
+            {
+                gd.Api.CmdSetViewport(commandBuffer, 0, ViewportsCount, Viewports.AsSpan());
+            }
+        }
+
+        private readonly void RecordCullMode(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
+        {
+            api.CmdSetCullMode(commandBuffer, CullMode);
+        }
+
+        private readonly void RecordFrontFace(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
+        {
+            api.CmdSetFrontFace(commandBuffer, _frontFace);
+        }
+
+        private readonly void RecordDepthTestBool(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
+        {
+            api.CmdSetDepthTestEnable(commandBuffer, DepthTestEnable);
+
+            api.CmdSetDepthWriteEnable(commandBuffer, DepthWriteEnable);
+        }
+
+        private readonly void RecordDepthTestCompareOp(ExtExtendedDynamicState api, CommandBuffer commandBuffer)
+        {
+            api.CmdSetDepthCompareOp(commandBuffer, _depthCompareOp);
+        }
+
+        private readonly void RecordRasterizationDiscard(ExtExtendedDynamicState2 extendedDynamicState2Api, CommandBuffer commandBuffer)
+        {
+            extendedDynamicState2Api.CmdSetRasterizerDiscardEnable(commandBuffer, _discard);
+        }
+
+        private readonly void RecordPrimitiveRestartEnable(VulkanRenderer gd, CommandBuffer commandBuffer)
+        {
+            bool primitiveRestartEnable = _primitiveRestartEnable;
+
+            bool topologySupportsRestart;
+
+            if (gd.Capabilities.SupportsPrimitiveTopologyListRestart)
+            {
+                topologySupportsRestart = gd.Capabilities.SupportsPrimitiveTopologyPatchListRestart ||
+                                          Topology != PrimitiveTopology.PatchList;
+            }
+            else
+            {
+                topologySupportsRestart = Topology == PrimitiveTopology.LineStrip ||
+                                          Topology == PrimitiveTopology.TriangleStrip ||
+                                          Topology == PrimitiveTopology.TriangleFan ||
+                                          Topology == PrimitiveTopology.LineStripWithAdjacency ||
+                                          Topology == PrimitiveTopology.TriangleStripWithAdjacency;
+            }
+
+            primitiveRestartEnable &= topologySupportsRestart;
+
+            // Cannot disable primitiveRestartEnable for these Topologies on MacOS.
+            if (gd.IsMoltenVk)
+            {
+                primitiveRestartEnable = true;
+            }
+
+            gd.ExtendedDynamicState2Api.CmdSetPrimitiveRestartEnable(commandBuffer, primitiveRestartEnable);
+        }
+
+        private readonly void RecordPrimitiveTopology(ExtExtendedDynamicState extendedDynamicStateApi, CommandBuffer commandBuffer)
+        {
+            extendedDynamicStateApi.CmdSetPrimitiveTopology(commandBuffer, Topology);
+        }
+
+        private readonly void RecordLogicOp(ExtExtendedDynamicState2 extendedDynamicState2Api, CommandBuffer commandBuffer)
+        {
+            extendedDynamicState2Api.CmdSetLogicOp(commandBuffer, _logicOp);
+        }
+
+        private readonly void RecordPatchControlPoints(ExtExtendedDynamicState2 extendedDynamicState2Api, CommandBuffer commandBuffer)
+        {
+            extendedDynamicState2Api.CmdSetPatchControlPoints(commandBuffer, _patchControlPoints);
+        }
+
+        private readonly void RecordLineWidth(Vk api, CommandBuffer commandBuffer)
+        {
+            api.CmdSetLineWidth(commandBuffer, _lineWidth);
        }

        private readonly void RecordFeedbackLoop(ExtAttachmentFeedbackLoopDynamicState api, CommandBuffer commandBuffer)
@@ -8,11 +8,15 @@ namespace Ryujinx.Graphics.Vulkan
        {
        }

-        public void SetRenderTarget(TextureView view, uint width, uint height)
+        public void SetRenderTarget(TextureView view, uint width, uint height, bool signalChange = true)
        {
            CreateFramebuffer(view, width, height);
            CreateRenderPass();
-            SignalStateChange();
+
+            if (signalChange)
+            {
+                SignalStateChange();
+            }
        }

        private void CreateFramebuffer(TextureView view, uint width, uint height)
@@ -7,312 +7,258 @@ namespace Ryujinx.Graphics.Vulkan
 {
    struct PipelineState : IDisposable
    {
-        private const int MaxDynamicStatesCount = 9;
+        private const int MaxDynamicStatesCount = 23;

        public PipelineUid Internal;

-        public float LineWidth
+        public PolygonMode PolygonMode
        {
-            readonly get => BitConverter.Int32BitsToSingle((int)((Internal.Id0 >> 0) & 0xFFFFFFFF));
-            set => Internal.Id0 = (Internal.Id0 & 0xFFFFFFFF00000000) | ((ulong)(uint)BitConverter.SingleToInt32Bits(value) << 0);
+            readonly get => (PolygonMode)((Internal.Id0 >> 0) & 0x3FFFFFFF);
+            set => Internal.Id0 = (Internal.Id0 & 0xFFFFFFFFC0000000) | ((ulong)value << 0);
        }

-        public float DepthBiasClamp
+        public uint StagesCount
        {
-            readonly get => BitConverter.Int32BitsToSingle((int)((Internal.Id0 >> 32) & 0xFFFFFFFF));
-            set => Internal.Id0 = (Internal.Id0 & 0xFFFFFFFF) | ((ulong)(uint)BitConverter.SingleToInt32Bits(value) << 32);
+            readonly get => (byte)((Internal.Id0 >> 30) & 0xFF);
+            set => Internal.Id0 = (Internal.Id0 & 0xFFFFFFC03FFFFFFF) | ((ulong)value << 30);
        }

-        public float DepthBiasConstantFactor
+        public uint VertexAttributeDescriptionsCount
        {
-            readonly get => BitConverter.Int32BitsToSingle((int)((Internal.Id1 >> 0) & 0xFFFFFFFF));
-            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFF00000000) | ((ulong)(uint)BitConverter.SingleToInt32Bits(value) << 0);
+            readonly get => (byte)((Internal.Id0 >> 38) & 0xFF);
+            set => Internal.Id0 = (Internal.Id0 & 0xFFFFC03FFFFFFFFF) | ((ulong)value << 38);
        }

-        public float DepthBiasSlopeFactor
+        public uint VertexBindingDescriptionsCount
        {
-            readonly get => BitConverter.Int32BitsToSingle((int)((Internal.Id1 >> 32) & 0xFFFFFFFF));
-            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFF) | ((ulong)(uint)BitConverter.SingleToInt32Bits(value) << 32);
+            readonly get => (byte)((Internal.Id0 >> 46) & 0xFF);
+            set => Internal.Id0 = (Internal.Id0 & 0xFFC03FFFFFFFFFFF) | ((ulong)value << 46);
        }

-        public uint StencilFrontCompareMask
+        public uint ViewportsCount
+        {
+            readonly get => (byte)((Internal.Id0 >> 54) & 0xFF);
+            set => Internal.Id0 = (Internal.Id0 & 0xC03FFFFFFFFFFFFF) | ((ulong)value << 54);
+        }
+
+        public uint ScissorsCount
+        {
+            readonly get => (byte)((Internal.Id1 >> 0) & 0xFF);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFFFFFFFF00) | ((ulong)value << 0);
+        }
+
+        public uint ColorBlendAttachmentStateCount
+        {
+            readonly get => (byte)((Internal.Id1 >> 8) & 0xFF);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFFFFFF00FF) | ((ulong)value << 8);
+        }
+
+        public PrimitiveTopology Topology
+        {
+            readonly get => (PrimitiveTopology)((Internal.Id1 >> 16) & 0xF);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFFFFF0FFFF) | ((ulong)value << 16);
+        }
+
+        public LogicOp LogicOp
+        {
+            readonly get => (LogicOp)((Internal.Id1 >> 20) & 0xF);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFFFF0FFFFF) | ((ulong)value << 20);
+        }
+
+        public CompareOp DepthCompareOp
+        {
+            readonly get => (CompareOp)((Internal.Id1 >> 24) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFFF8FFFFFF) | ((ulong)value << 24);
+        }
+
+        public StencilOp StencilFrontFailOp
+        {
+            readonly get => (StencilOp)((Internal.Id1 >> 27) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFFC7FFFFFF) | ((ulong)value << 27);
+        }
+
+        public StencilOp StencilFrontPassOp
+        {
+            readonly get => (StencilOp)((Internal.Id1 >> 30) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFFE3FFFFFFF) | ((ulong)value << 30);
+        }
+
+        public StencilOp StencilFrontDepthFailOp
+        {
+            readonly get => (StencilOp)((Internal.Id1 >> 33) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFFF1FFFFFFFF) | ((ulong)value << 33);
+        }
+
+        public CompareOp StencilFrontCompareOp
+        {
+            readonly get => (CompareOp)((Internal.Id1 >> 36) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFF8FFFFFFFFF) | ((ulong)value << 36);
+        }
+
+        public StencilOp StencilBackFailOp
+        {
+            readonly get => (StencilOp)((Internal.Id1 >> 39) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFFC7FFFFFFFFF) | ((ulong)value << 39);
+        }
+
+        public StencilOp StencilBackPassOp
+        {
+            readonly get => (StencilOp)((Internal.Id1 >> 42) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFFE3FFFFFFFFFF) | ((ulong)value << 42);
+        }
+
+        public StencilOp StencilBackDepthFailOp
+        {
+            readonly get => (StencilOp)((Internal.Id1 >> 45) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFFF1FFFFFFFFFFF) | ((ulong)value << 45);
+        }
+
+        public CompareOp StencilBackCompareOp
+        {
+            readonly get => (CompareOp)((Internal.Id1 >> 48) & 0x7);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFF8FFFFFFFFFFFF) | ((ulong)value << 48);
+        }
+
+        public CullModeFlags CullMode
+        {
+            readonly get => (CullModeFlags)((Internal.Id1 >> 51) & 0x3);
+            set => Internal.Id1 = (Internal.Id1 & 0xFFE7FFFFFFFFFFFF) | ((ulong)value << 51);
+        }
+
+        public bool PrimitiveRestartEnable
+        {
+            readonly get => ((Internal.Id1 >> 53) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xFFDFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 53);
+        }
+
+        public bool DepthClampEnable
+        {
+            readonly get => ((Internal.Id1 >> 54) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xFFBFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 54);
+        }
+
+        public bool RasterizerDiscardEnable
+        {
+            readonly get => ((Internal.Id1 >> 55) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xFF7FFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 55);
+        }
+
+        public FrontFace FrontFace
+        {
+            readonly get => (FrontFace)((Internal.Id1 >> 56) & 0x1);
+            set => Internal.Id1 = (Internal.Id1 & 0xFEFFFFFFFFFFFFFF) | ((ulong)value << 56);
+        }
+
+        public bool DepthBiasEnable
+        {
+            readonly get => ((Internal.Id1 >> 57) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xFDFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 57);
+        }
+
+        public bool DepthTestEnable
+        {
+            readonly get => ((Internal.Id1 >> 58) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xFBFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 58);
+        }
+
+        public bool DepthWriteEnable
+        {
+            readonly get => ((Internal.Id1 >> 59) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xF7FFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 59);
+        }
+
+        public bool DepthBoundsTestEnable
+        {
+            readonly get => ((Internal.Id1 >> 60) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xEFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 60);
+        }
+
+        public bool StencilTestEnable
+        {
+            readonly get => ((Internal.Id1 >> 61) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xDFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 61);
+        }
+
+        public bool LogicOpEnable
+        {
+            readonly get => ((Internal.Id1 >> 62) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0xBFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 62);
+        }
+
+        public bool HasDepthStencil
+        {
+            readonly get => ((Internal.Id1 >> 63) & 0x1) != 0UL;
+            set => Internal.Id1 = (Internal.Id1 & 0x7FFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 63);
+        }
+
+        public uint PatchControlPoints
        {
            readonly get => (uint)((Internal.Id2 >> 0) & 0xFFFFFFFF);
            set => Internal.Id2 = (Internal.Id2 & 0xFFFFFFFF00000000) | ((ulong)value << 0);
        }

-        public uint StencilFrontWriteMask
+        public uint SamplesCount
        {
            readonly get => (uint)((Internal.Id2 >> 32) & 0xFFFFFFFF);
            set => Internal.Id2 = (Internal.Id2 & 0xFFFFFFFF) | ((ulong)value << 32);
        }

-        public uint StencilFrontReference
-        {
-            readonly get => (uint)((Internal.Id3 >> 0) & 0xFFFFFFFF);
-            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFF00000000) | ((ulong)value << 0);
-        }
-
-        public uint StencilBackCompareMask
-        {
-            readonly get => (uint)((Internal.Id3 >> 32) & 0xFFFFFFFF);
-            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFF) | ((ulong)value << 32);
-        }
-
-        public uint StencilBackWriteMask
-        {
-            readonly get => (uint)((Internal.Id4 >> 0) & 0xFFFFFFFF);
-            set => Internal.Id4 = (Internal.Id4 & 0xFFFFFFFF00000000) | ((ulong)value << 0);
-        }
-
-        public uint StencilBackReference
-        {
-            readonly get => (uint)((Internal.Id4 >> 32) & 0xFFFFFFFF);
-            set => Internal.Id4 = (Internal.Id4 & 0xFFFFFFFF) | ((ulong)value << 32);
-        }
-
-        public PolygonMode PolygonMode
-        {
-            readonly get => (PolygonMode)((Internal.Id5 >> 0) & 0x3FFFFFFF);
-            set => Internal.Id5 = (Internal.Id5 & 0xFFFFFFFFC0000000) | ((ulong)value << 0);
-        }
-
-        public uint StagesCount
-        {
-            readonly get => (byte)((Internal.Id5 >> 30) & 0xFF);
-            set => Internal.Id5 = (Internal.Id5 & 0xFFFFFFC03FFFFFFF) | ((ulong)value << 30);
-        }
-
-        public uint VertexAttributeDescriptionsCount
-        {
-            readonly get => (byte)((Internal.Id5 >> 38) & 0xFF);
-            set => Internal.Id5 = (Internal.Id5 & 0xFFFFC03FFFFFFFFF) | ((ulong)value << 38);
-        }
-
-        public uint VertexBindingDescriptionsCount
-        {
-            readonly get => (byte)((Internal.Id5 >> 46) & 0xFF);
-            set => Internal.Id5 = (Internal.Id5 & 0xFFC03FFFFFFFFFFF) | ((ulong)value << 46);
-        }
-
-        public uint ViewportsCount
-        {
-            readonly get => (byte)((Internal.Id5 >> 54) & 0xFF);
-            set => Internal.Id5 = (Internal.Id5 & 0xC03FFFFFFFFFFFFF) | ((ulong)value << 54);
-        }
-
-        public uint ScissorsCount
-        {
-            readonly get => (byte)((Internal.Id6 >> 0) & 0xFF);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFFFFFF00) | ((ulong)value << 0);
-        }
-
-        public uint ColorBlendAttachmentStateCount
-        {
-            readonly get => (byte)((Internal.Id6 >> 8) & 0xFF);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFFFF00FF) | ((ulong)value << 8);
-        }
-
-        public PrimitiveTopology Topology
-        {
-            readonly get => (PrimitiveTopology)((Internal.Id6 >> 16) & 0xF);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFFF0FFFF) | ((ulong)value << 16);
-        }
-
-        public LogicOp LogicOp
-        {
-            readonly get => (LogicOp)((Internal.Id6 >> 20) & 0xF);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFF0FFFFF) | ((ulong)value << 20);
-        }
-
-        public CompareOp DepthCompareOp
-        {
-            readonly get => (CompareOp)((Internal.Id6 >> 24) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFF8FFFFFF) | ((ulong)value << 24);
-        }
-
-        public StencilOp StencilFrontFailOp
-        {
-            readonly get => (StencilOp)((Internal.Id6 >> 27) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFC7FFFFFF) | ((ulong)value << 27);
-        }
-
-        public StencilOp StencilFrontPassOp
-        {
-            readonly get => (StencilOp)((Internal.Id6 >> 30) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFE3FFFFFFF) | ((ulong)value << 30);
-        }
-
-        public StencilOp StencilFrontDepthFailOp
-        {
-            readonly get => (StencilOp)((Internal.Id6 >> 33) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFF1FFFFFFFF) | ((ulong)value << 33);
-        }
-
-        public CompareOp StencilFrontCompareOp
-        {
-            readonly get => (CompareOp)((Internal.Id6 >> 36) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFF8FFFFFFFFF) | ((ulong)value << 36);
-        }
-
-        public StencilOp StencilBackFailOp
-        {
-            readonly get => (StencilOp)((Internal.Id6 >> 39) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFFC7FFFFFFFFF) | ((ulong)value << 39);
-        }
-
-        public StencilOp StencilBackPassOp
-        {
-            readonly get => (StencilOp)((Internal.Id6 >> 42) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFFE3FFFFFFFFFF) | ((ulong)value << 42);
-        }
-
-        public StencilOp StencilBackDepthFailOp
-        {
-            readonly get => (StencilOp)((Internal.Id6 >> 45) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFFF1FFFFFFFFFFF) | ((ulong)value << 45);
-        }
-
-        public CompareOp StencilBackCompareOp
-        {
-            readonly get => (CompareOp)((Internal.Id6 >> 48) & 0x7);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFF8FFFFFFFFFFFF) | ((ulong)value << 48);
-        }
-
-        public CullModeFlags CullMode
-        {
-            readonly get => (CullModeFlags)((Internal.Id6 >> 51) & 0x3);
-            set => Internal.Id6 = (Internal.Id6 & 0xFFE7FFFFFFFFFFFF) | ((ulong)value << 51);
-        }
-
-        public bool PrimitiveRestartEnable
-        {
-            readonly get => ((Internal.Id6 >> 53) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xFFDFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 53);
-        }
-
-        public bool DepthClampEnable
-        {
-            readonly get => ((Internal.Id6 >> 54) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xFFBFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 54);
-        }
-
-        public bool RasterizerDiscardEnable
-        {
-            readonly get => ((Internal.Id6 >> 55) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xFF7FFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 55);
-        }
-
-        public FrontFace FrontFace
-        {
-            readonly get => (FrontFace)((Internal.Id6 >> 56) & 0x1);
-            set => Internal.Id6 = (Internal.Id6 & 0xFEFFFFFFFFFFFFFF) | ((ulong)value << 56);
-        }
-
-        public bool DepthBiasEnable
-        {
-            readonly get => ((Internal.Id6 >> 57) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xFDFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 57);
-        }
-
-        public bool DepthTestEnable
-        {
-            readonly get => ((Internal.Id6 >> 58) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xFBFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 58);
-        }
-
-        public bool DepthWriteEnable
-        {
-            readonly get => ((Internal.Id6 >> 59) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xF7FFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 59);
-        }
-
-        public bool DepthBoundsTestEnable
-        {
-            readonly get => ((Internal.Id6 >> 60) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xEFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 60);
-        }
-
-        public bool StencilTestEnable
-        {
-            readonly get => ((Internal.Id6 >> 61) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xDFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 61);
-        }
-
-        public bool LogicOpEnable
-        {
-            readonly get => ((Internal.Id6 >> 62) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0xBFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 62);
-        }
-
-        public bool HasDepthStencil
-        {
-            readonly get => ((Internal.Id6 >> 63) & 0x1) != 0UL;
-            set => Internal.Id6 = (Internal.Id6 & 0x7FFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 63);
-        }
-
-        public uint PatchControlPoints
-        {
-            readonly get => (uint)((Internal.Id7 >> 0) & 0xFFFFFFFF);
-            set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFF00000000) | ((ulong)value << 0);
-        }
-
-        public uint SamplesCount
-        {
-            readonly get => (uint)((Internal.Id7 >> 32) & 0xFFFFFFFF);
-            set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFF) | ((ulong)value << 32);
-        }
-
        public bool AlphaToCoverageEnable
        {
-            readonly get => ((Internal.Id8 >> 0) & 0x1) != 0UL;
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFFE) | ((value ? 1UL : 0UL) << 0);
+            readonly get => ((Internal.Id3 >> 0) & 0x1) != 0UL;
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFFFE) | ((value ? 1UL : 0UL) << 0);
        }

        public bool AlphaToOneEnable
        {
-            readonly get => ((Internal.Id8 >> 1) & 0x1) != 0UL;
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFFD) | ((value ? 1UL : 0UL) << 1);
+            readonly get => ((Internal.Id3 >> 1) & 0x1) != 0UL;
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFFFD) | ((value ? 1UL : 0UL) << 1);
        }

        public bool AdvancedBlendSrcPreMultiplied
        {
-            readonly get => ((Internal.Id8 >> 2) & 0x1) != 0UL;
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFFB) | ((value ? 1UL : 0UL) << 2);
+            readonly get => ((Internal.Id3 >> 2) & 0x1) != 0UL;
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFFFB) | ((value ? 1UL : 0UL) << 2);
        }

        public bool AdvancedBlendDstPreMultiplied
        {
-            readonly get => ((Internal.Id8 >> 3) & 0x1) != 0UL;
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFF7) | ((value ? 1UL : 0UL) << 3);
+            readonly get => ((Internal.Id3 >> 3) & 0x1) != 0UL;
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFFF7) | ((value ? 1UL : 0UL) << 3);
        }

        public BlendOverlapEXT AdvancedBlendOverlap
        {
-            readonly get => (BlendOverlapEXT)((Internal.Id8 >> 4) & 0x3);
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFCF) | ((ulong)value << 4);
+            readonly get => (BlendOverlapEXT)((Internal.Id3 >> 4) & 0x3);
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFFCF) | ((ulong)value << 4);
        }

        public bool DepthMode
        {
-            readonly get => ((Internal.Id8 >> 6) & 0x1) != 0UL;
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFBF) | ((value ? 1UL : 0UL) << 6);
+            readonly get => ((Internal.Id3 >> 6) & 0x1) != 0UL;
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFFBF) | ((value ? 1UL : 0UL) << 6);
        }

        public FeedbackLoopAspects FeedbackLoopAspects
        {
-            readonly get => (FeedbackLoopAspects)((Internal.Id8 >> 7) & 0x3);
-            set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFE7F) | (((ulong)value) << 7);
+            readonly get => (FeedbackLoopAspects)((Internal.Id3 >> 7) & 0x3);
+            set => Internal.Id3 = (Internal.Id3 & 0xFFFFFFFFFFFFFE7F) | (((ulong)value) << 7);
        }

        public bool HasTessellationControlShader;
+        public bool FeedbackLoopDynamicState;
        public NativeArray<PipelineShaderStageCreateInfo> Stages;
        public PipelineLayout PipelineLayout;
        public SpecData SpecializationData;

        private Array32<VertexInputAttributeDescription> _vertexAttributeDescriptions2;

-        public void Initialize()
+        private bool _supportsExtDynamicState;
+        private PhysicalDeviceExtendedDynamicState2FeaturesEXT _supportsExtDynamicState2;
+        private bool _supportsFeedBackLoopDynamicState;
+        private uint _blendEnables;
+
+        public void Initialize(HardwareCapabilities capabilities)
        {
            HasTessellationControlShader = false;
            Stages = new NativeArray<PipelineShaderStageCreateInfo>(Constants.MaxShaderStages);
@@ -321,9 +267,54 @@ namespace Ryujinx.Graphics.Vulkan
            AdvancedBlendDstPreMultiplied = true;
            AdvancedBlendOverlap = BlendOverlapEXT.UncorrelatedExt;

-            LineWidth = 1f;
-            SamplesCount = 1;
            DepthMode = true;
+
+            PolygonMode = PolygonMode.Fill;
+            DepthBoundsTestEnable = false;
+
+            _supportsExtDynamicState = capabilities.SupportsExtendedDynamicState;
+            _supportsExtDynamicState2 = capabilities.SupportsExtendedDynamicState2;
+            _supportsFeedBackLoopDynamicState = capabilities.SupportsDynamicAttachmentFeedbackLoop;
+
+            if (_supportsExtDynamicState)
+            {
+                StencilFrontFailOp = 0;
+                StencilFrontPassOp = 0;
+                StencilFrontDepthFailOp = 0;
+                StencilFrontCompareOp = 0;
+
+                StencilBackFailOp = 0;
+                StencilBackPassOp = 0;
+                StencilBackDepthFailOp = 0;
+                StencilBackCompareOp = 0;
+
+                ViewportsCount = 0;
+                ScissorsCount = 0;
+
+                CullMode = 0;
+                FrontFace = 0;
+                DepthTestEnable = false;
+                DepthWriteEnable = false;
+                DepthCompareOp = 0;
+                StencilTestEnable = false;
+            }
+
+            if (_supportsExtDynamicState2.ExtendedDynamicState2)
+            {
+                PrimitiveRestartEnable = false;
+                DepthBiasEnable = false;
+                RasterizerDiscardEnable = false;
+
+                if (_supportsExtDynamicState2.ExtendedDynamicState2LogicOp)
+                {
+                    LogicOp = 0;
+                }
+
+                if (_supportsExtDynamicState2.ExtendedDynamicState2PatchControlPoints)
+                {
+                    PatchControlPoints = 0;
+                }
+            }
        }

        public unsafe Auto<DisposablePipeline> CreateComputePipeline(
@@ -341,7 +332,6 @@ namespace Ryujinx.Graphics.Vulkan
            {
                SType = StructureType.ComputePipelineCreateInfo,
                Stage = Stages[0],
-                BasePipelineIndex = -1,
                Layout = PipelineLayout,
            };

@@ -377,6 +367,74 @@ namespace Ryujinx.Graphics.Vulkan
            return pipeline;
        }

+
+        private void CheckCapability(VulkanRenderer gd)
+        {
+            // Vendors other than NVIDIA have a bug where it enables logical operations even for float formats,
+            // so we need to force disable them here.
+            LogicOpEnable = LogicOpEnable && (gd.Vendor == Vendor.Nvidia || Internal.LogicOpsAllowed);
+
+            if (!_supportsExtDynamicState)
+            {
+                DepthWriteEnable = DepthWriteEnable && DepthTestEnable;
+                DepthCompareOp = DepthTestEnable ? DepthCompareOp : default;
+            }
+
+            if (!_supportsExtDynamicState2.ExtendedDynamicState2LogicOp)
+            {
+                LogicOp = LogicOpEnable ? LogicOp : default;
+            }
+
+            if (!_supportsExtDynamicState2.ExtendedDynamicState2)
+            {
+                bool topologySupportsRestart;
+
+                if (gd.Capabilities.SupportsPrimitiveTopologyListRestart)
+                {
+                    topologySupportsRestart = gd.Capabilities.SupportsPrimitiveTopologyPatchListRestart ||
+                                              Topology != PrimitiveTopology.PatchList;
+                }
+                else
+                {
+                    topologySupportsRestart = Topology == PrimitiveTopology.LineStrip ||
+                                              Topology == PrimitiveTopology.TriangleStrip ||
+                                              Topology == PrimitiveTopology.TriangleFan ||
+                                              Topology == PrimitiveTopology.LineStripWithAdjacency ||
+                                              Topology == PrimitiveTopology.TriangleStripWithAdjacency;
+                }
+
+                PrimitiveRestartEnable &= topologySupportsRestart;
+            }
+
+            if (_supportsExtDynamicState)
+            {
+                Topology = Topology.ConvertToClass();
+            }
+
+            Topology = HasTessellationControlShader ? PrimitiveTopology.PatchList : Topology;
+
+            if (gd.IsMoltenVk && Internal.AttachmentIntegerFormatMask != 0)
+            {
+                _blendEnables = 0;
+
+                // Blend can't be enabled for integer formats, so let's make sure it is disabled.
+                uint attachmentIntegerFormatMask = Internal.AttachmentIntegerFormatMask;
+
+                while (attachmentIntegerFormatMask != 0)
+                {
+                    int i = BitOperations.TrailingZeroCount(attachmentIntegerFormatMask);
+
+                    if (Internal.ColorBlendAttachmentState[i].BlendEnable)
+                    {
+                        _blendEnables |= 1u << i;
+                    }
+
+                    Internal.ColorBlendAttachmentState[i].BlendEnable = false;
+                    attachmentIntegerFormatMask &= ~(1u << i);
+                }
+            }
+        }
+
        public unsafe Auto<DisposablePipeline> CreateGraphicsPipeline(
            VulkanRenderer gd,
            Device device,
@@ -385,6 +443,17 @@ namespace Ryujinx.Graphics.Vulkan
            RenderPass renderPass,
            bool throwOnError = false)
        {
+            CheckCapability(gd);
+
+            // Using patches topology without a tessellation shader is invalid.
+            // If we find such a case, return null pipeline to skip the draw.
+            if (Topology == PrimitiveTopology.PatchList && !HasTessellationControlShader)
+            {
+                program.AddGraphicsPipeline(ref Internal, null);
+
+                return null;
+            }
+
            if (program.TryGetGraphicsPipeline(ref Internal, out Auto<DisposablePipeline> pipeline))
            {
                return pipeline;
@@ -394,7 +463,7 @@ namespace Ryujinx.Graphics.Vulkan

            bool isMoltenVk = gd.IsMoltenVk;

-            if (isMoltenVk)
+            if (isMoltenVk && !_supportsExtDynamicState)
            {
                UpdateVertexAttributeDescriptions(gd);
            }
@@ -408,7 +477,7 @@ namespace Ryujinx.Graphics.Vulkan
                {
                    SType = StructureType.PipelineVertexInputStateCreateInfo,
                    VertexAttributeDescriptionCount = VertexAttributeDescriptionsCount,
-                    PVertexAttributeDescriptions = isMoltenVk ? pVertexAttributeDescriptions2 : pVertexAttributeDescriptions,
+                    PVertexAttributeDescriptions = isMoltenVk && !_supportsExtDynamicState ? pVertexAttributeDescriptions2 : pVertexAttributeDescriptions,
                    VertexBindingDescriptionCount = VertexBindingDescriptionsCount,
                    PVertexBindingDescriptions = pVertexBindingDescriptions,
                };
@@ -444,33 +513,22 @@ namespace Ryujinx.Graphics.Vulkan
                PipelineInputAssemblyStateCreateInfo inputAssemblyState = new()
                {
                    SType = StructureType.PipelineInputAssemblyStateCreateInfo,
-                    PrimitiveRestartEnable = primitiveRestartEnable,
-                    Topology = HasTessellationControlShader ? PrimitiveTopology.PatchList : Topology,
+                    Topology = Topology,
                };

-                PipelineTessellationStateCreateInfo tessellationState = new()
-                {
-                    SType = StructureType.PipelineTessellationStateCreateInfo,
-                    PatchControlPoints = PatchControlPoints,
-                };
+                PipelineTessellationStateCreateInfo tessellationState;

                PipelineRasterizationStateCreateInfo rasterizationState = new()
                {
                    SType = StructureType.PipelineRasterizationStateCreateInfo,
                    DepthClampEnable = DepthClampEnable,
-                    RasterizerDiscardEnable = RasterizerDiscardEnable,
-                    PolygonMode = PolygonMode,
-                    LineWidth = LineWidth,
-                    CullMode = CullMode,
-                    FrontFace = FrontFace,
-                    DepthBiasEnable = DepthBiasEnable,
+                    // When widelines feature is not supported it must be 1.0f, this will be ignored if Line Width dynamic state is supported
+                    LineWidth = 1.0f,
                };

                PipelineViewportStateCreateInfo viewportState = new()
                {
                    SType = StructureType.PipelineViewportStateCreateInfo,
-                    ViewportCount = ViewportsCount,
-                    ScissorCount = ScissorsCount,
                };

                if (gd.Capabilities.SupportsDepthClipControl)
@@ -494,64 +552,70 @@ namespace Ryujinx.Graphics.Vulkan
                    AlphaToOneEnable = AlphaToOneEnable,
                };

-                StencilOpState stencilFront = new(
-                    StencilFrontFailOp,
-                    StencilFrontPassOp,
-                    StencilFrontDepthFailOp,
-                    StencilFrontCompareOp);
-
-                StencilOpState stencilBack = new(
-                    StencilBackFailOp,
-                    StencilBackPassOp,
-                    StencilBackDepthFailOp,
-                    StencilBackCompareOp);
-
                PipelineDepthStencilStateCreateInfo depthStencilState = new()
                {
                    SType = StructureType.PipelineDepthStencilStateCreateInfo,
-                    DepthTestEnable = DepthTestEnable,
-                    DepthWriteEnable = DepthWriteEnable,
-                    DepthCompareOp = DepthCompareOp,
-                    DepthBoundsTestEnable = false,
-                    StencilTestEnable = StencilTestEnable,
-                    Front = stencilFront,
-                    Back = stencilBack,
+                    DepthBoundsTestEnable = DepthBoundsTestEnable,
                };

-                uint blendEnables = 0;
-
-                if (gd.IsMoltenVk && Internal.AttachmentIntegerFormatMask != 0)
+                if (!_supportsExtDynamicState)
                {
-                    // Blend can't be enabled for integer formats, so let's make sure it is disabled.
-                    uint attachmentIntegerFormatMask = Internal.AttachmentIntegerFormatMask;
+                    rasterizationState.CullMode = CullMode;
+                    rasterizationState.FrontFace = FrontFace;

-                    while (attachmentIntegerFormatMask != 0)
-                    {
-                        int i = BitOperations.TrailingZeroCount(attachmentIntegerFormatMask);
+                    viewportState.ViewportCount = ViewportsCount;
+                    viewportState.ScissorCount = ScissorsCount;

-                        if (Internal.ColorBlendAttachmentState[i].BlendEnable)
-                        {
-                            blendEnables |= 1u << i;
-                        }
+                    StencilOpState stencilFront = new(
+                        StencilFrontFailOp,
+                        StencilFrontPassOp,
+                        StencilFrontDepthFailOp,
+                        StencilFrontCompareOp);

-                        Internal.ColorBlendAttachmentState[i].BlendEnable = false;
-                        attachmentIntegerFormatMask &= ~(1u << i);
-                    }
+                    StencilOpState stencilBack = new(
+                        StencilBackFailOp,
+                        StencilBackPassOp,
+                        StencilBackDepthFailOp,
+                        StencilBackCompareOp);
+
+                    depthStencilState.Front = stencilFront;
+                    depthStencilState.Back = stencilBack;
+                    depthStencilState.StencilTestEnable = StencilTestEnable;
+                    depthStencilState.DepthTestEnable = DepthTestEnable;
+                    depthStencilState.DepthWriteEnable = DepthWriteEnable;
+                    depthStencilState.DepthCompareOp = DepthCompareOp;
                }

-                // Vendors other than NVIDIA have a bug where it enables logical operations even for float formats,
-                // so we need to force disable them here.
-                bool logicOpEnable = LogicOpEnable && (gd.Vendor == Vendor.Nvidia || Internal.LogicOpsAllowed);
+                if (!_supportsExtDynamicState2.ExtendedDynamicState2)
+                {
+
+                    inputAssemblyState.PrimitiveRestartEnable = PrimitiveRestartEnable;
+                    rasterizationState.DepthBiasEnable = DepthBiasEnable;
+                    rasterizationState.RasterizerDiscardEnable = RasterizerDiscardEnable;
+                }
+
+                if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
+                {
+                    tessellationState = new PipelineTessellationStateCreateInfo
+                    {
+                        SType = StructureType.PipelineTessellationStateCreateInfo,
+                        PatchControlPoints = PatchControlPoints,
+                    };
+                }

                PipelineColorBlendStateCreateInfo colorBlendState = new()
                {
                    SType = StructureType.PipelineColorBlendStateCreateInfo,
-                    LogicOpEnable = logicOpEnable,
-                    LogicOp = LogicOp,
                    AttachmentCount = ColorBlendAttachmentStateCount,
                    PAttachments = pColorBlendAttachmentState,
+                    LogicOpEnable = LogicOpEnable,
                };

+                if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2LogicOp)
+                {
+                    colorBlendState.LogicOp = LogicOp;
+                }
+
                if (!AdvancedBlendSrcPreMultiplied ||
                    !AdvancedBlendDstPreMultiplied ||
                    AdvancedBlendOverlap != BlendOverlapEXT.UncorrelatedExt)
@@ -567,66 +631,99 @@ namespace Ryujinx.Graphics.Vulkan
                    colorBlendState.PNext = &colorBlendAdvancedState;
                }

-                bool supportsExtDynamicState = gd.Capabilities.SupportsExtendedDynamicState;
-                bool supportsFeedbackLoopDynamicState = gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop;
-
                DynamicState* dynamicStates = stackalloc DynamicState[MaxDynamicStatesCount];

-                int dynamicStatesCount = 7;
+                uint dynamicStatesCount = 7;

                dynamicStates[0] = DynamicState.Viewport;
                dynamicStates[1] = DynamicState.Scissor;
-                dynamicStates[2] = DynamicState.DepthBias;
-                dynamicStates[3] = DynamicState.StencilCompareMask;
-                dynamicStates[4] = DynamicState.StencilWriteMask;
-                dynamicStates[5] = DynamicState.StencilReference;
-                dynamicStates[6] = DynamicState.BlendConstants;
+                dynamicStates[2] = DynamicState.StencilCompareMask;
+                dynamicStates[3] = DynamicState.StencilWriteMask;
+                dynamicStates[4] = DynamicState.StencilReference;
+                dynamicStates[5] = DynamicState.BlendConstants;
+                dynamicStates[6] = DynamicState.DepthBias;

-                if (supportsExtDynamicState && (gd.SupportsMTL31 || !gd.IsMoltenVk))
+                if (!isMoltenVk)
                {
-                    // Requires Metal 3.1 and new MoltenVK, however extended dynamic states extension is not
-                    // available on older versions of MVK, so we can safely check only OS version.
-                    dynamicStates[dynamicStatesCount++] = DynamicState.VertexInputBindingStrideExt;
+                    //LineWidth dynamic state is only supported on macOS when using Metal Private API on newer version of MoltenVK
+                    dynamicStates[dynamicStatesCount++] = DynamicState.LineWidth;
                }

-                if (supportsFeedbackLoopDynamicState)
+                if (_supportsExtDynamicState)
                {
-                    dynamicStates[dynamicStatesCount++] = DynamicState.AttachmentFeedbackLoopEnableExt;
+                    if (gd.SupportsMTL31 || !gd.IsMoltenVk)
+                    {
+                        // Requires Metal 3.1 and new MoltenVK, however extended dynamic states extension is not
+                        // available on older versions of MVK, so we can safely check only OS version.
+                        dynamicStates[dynamicStatesCount++] = DynamicState.VertexInputBindingStrideExt;
+                    }
+                    dynamicStates[0] = DynamicState.ViewportWithCountExt;
+                    dynamicStates[1] = DynamicState.ScissorWithCountExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.CullModeExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.FrontFaceExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.DepthTestEnableExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.DepthWriteEnableExt;
+
+                    dynamicStates[dynamicStatesCount++] = DynamicState.DepthCompareOpExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.StencilTestEnableExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.StencilOpExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.PrimitiveTopologyExt;
                }

-                PipelineDynamicStateCreateInfo pipelineDynamicStateCreateInfo = new()
+                if (_supportsExtDynamicState2.ExtendedDynamicState2)
                {
-                    SType = StructureType.PipelineDynamicStateCreateInfo,
-                    DynamicStateCount = (uint)dynamicStatesCount,
-                    PDynamicStates = dynamicStates,
-                };
+                    dynamicStates[dynamicStatesCount++] = DynamicState.DepthBiasEnableExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.RasterizerDiscardEnableExt;
+                    dynamicStates[dynamicStatesCount++] = DynamicState.PrimitiveRestartEnableExt;

-                PipelineCreateFlags flags = 0;
+                    if (_supportsExtDynamicState2.ExtendedDynamicState2LogicOp)
+                    {
+                        dynamicStates[dynamicStatesCount++] = DynamicState.LogicOpExt;
+                    }
+                    if (_supportsExtDynamicState2.ExtendedDynamicState2PatchControlPoints)
+                    {
+                        dynamicStates[dynamicStatesCount++] = DynamicState.PatchControlPointsExt;
+                    }
+                }

-                if (gd.Capabilities.SupportsAttachmentFeedbackLoop)
+                PipelineCreateFlags pipelineCreateFlags = 0;
+
+                if (gd.Capabilities.SupportsAttachmentFeedbackLoop && !_supportsFeedBackLoopDynamicState)
                {
                    FeedbackLoopAspects aspects = FeedbackLoopAspects;

                    if ((aspects & FeedbackLoopAspects.Color) != 0)
                    {
-                        flags |= PipelineCreateFlags.CreateColorAttachmentFeedbackLoopBitExt;
+                        pipelineCreateFlags |= PipelineCreateFlags.CreateColorAttachmentFeedbackLoopBitExt;
                    }

                    if ((aspects & FeedbackLoopAspects.Depth) != 0)
                    {
-                        flags |= PipelineCreateFlags.CreateDepthStencilAttachmentFeedbackLoopBitExt;
+                        pipelineCreateFlags |= PipelineCreateFlags.CreateDepthStencilAttachmentFeedbackLoopBitExt;
                    }
                }

+                if (_supportsFeedBackLoopDynamicState && FeedbackLoopDynamicState)
+                {
+                    dynamicStates[dynamicStatesCount++] = DynamicState.AttachmentFeedbackLoopEnableExt;
+                    FeedbackLoopDynamicState = false;
+                }
+
+                PipelineDynamicStateCreateInfo pipelineDynamicStateCreateInfo = new()
+                {
+                    SType = StructureType.PipelineDynamicStateCreateInfo,
+                    DynamicStateCount = dynamicStatesCount,
+                    PDynamicStates = dynamicStates,
+                };
+
                GraphicsPipelineCreateInfo pipelineCreateInfo = new()
                {
                    SType = StructureType.GraphicsPipelineCreateInfo,
-                    Flags = flags,
                    StageCount = StagesCount,
+                    Flags = pipelineCreateFlags,
                    PStages = Stages.Pointer,
                    PVertexInputState = &vertexInputState,
                    PInputAssemblyState = &inputAssemblyState,
-                    PTessellationState = &tessellationState,
                    PViewportState = &viewportState,
                    PRasterizationState = &rasterizationState,
                    PMultisampleState = &multisampleState,
@@ -637,6 +734,11 @@ namespace Ryujinx.Graphics.Vulkan
                    RenderPass = renderPass,
                };

+                if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
+                {
+                    pipelineCreateInfo.PTessellationState = &tessellationState;
+                }
+
                Result result = gd.Api.CreateGraphicsPipelines(device, cache, 1, &pipelineCreateInfo, null, &pipelineHandle);

                if (throwOnError)
@@ -649,21 +751,21 @@ namespace Ryujinx.Graphics.Vulkan

                    return null;
                }
-
-                // Restore previous blend enable values if we changed it.
-                while (blendEnables != 0)
-                {
-                    int i = BitOperations.TrailingZeroCount(blendEnables);
-
-                    Internal.ColorBlendAttachmentState[i].BlendEnable = true;
-                    blendEnables &= ~(1u << i);
-                }
            }

            pipeline = new Auto<DisposablePipeline>(new DisposablePipeline(gd.Api, device, pipelineHandle));

            program.AddGraphicsPipeline(ref Internal, pipeline);

+            // Restore previous blend enable values if we changed it.
+            while (_blendEnables != 0)
+            {
+                int i = BitOperations.TrailingZeroCount(_blendEnables);
+
+                Internal.ColorBlendAttachmentState[i].BlendEnable = true;
+                _blendEnables &= ~(1u << i);
+            }
+
            return pipeline;
        }

@@ -11,23 +11,17 @@ namespace Ryujinx.Graphics.Vulkan
    {
        public ulong Id0;
        public ulong Id1;
+
        public ulong Id2;
        public ulong Id3;

-        public ulong Id4;
-        public ulong Id5;
-        public ulong Id6;
-
-        public ulong Id7;
-        public ulong Id8;
-
-        private readonly uint VertexAttributeDescriptionsCount => (byte)((Id5 >> 38) & 0xFF);
-        private readonly uint VertexBindingDescriptionsCount => (byte)((Id5 >> 46) & 0xFF);
-        private readonly uint ColorBlendAttachmentStateCount => (byte)((Id6 >> 8) & 0xFF);
-        private readonly bool HasDepthStencil => ((Id6 >> 63) & 0x1) != 0UL;
+        private readonly uint VertexAttributeDescriptionsCount => (byte)((Id0 >> 38) & 0xFF);
+        private readonly uint VertexBindingDescriptionsCount => (byte)((Id0 >> 46) & 0xFF);
+        private readonly uint ColorBlendAttachmentStateCount => (byte)((Id1 >> 8) & 0xFF);
+        private readonly bool HasDepthStencil => ((Id1 >> 63) & 0x1) != 0UL;

        public Array32<VertexInputAttributeDescription> VertexAttributeDescriptions;
-        public Array33<VertexInputBindingDescription> VertexBindingDescriptions;
+        public Array32<VertexInputBindingDescription> VertexBindingDescriptions;
        public Array8<PipelineColorBlendAttachmentState> ColorBlendAttachmentState;
        public Array9<Format> AttachmentFormats;
        public uint AttachmentIntegerFormatMask;
@@ -40,9 +34,7 @@ namespace Ryujinx.Graphics.Vulkan

        public bool Equals(ref PipelineUid other)
        {
-            if (!Unsafe.As<ulong, Vector256<byte>>(ref Id0).Equals(Unsafe.As<ulong, Vector256<byte>>(ref other.Id0)) ||
-                !Unsafe.As<ulong, Vector256<byte>>(ref Id4).Equals(Unsafe.As<ulong, Vector256<byte>>(ref other.Id4)) ||
-                !Unsafe.As<ulong, Vector128<byte>>(ref Id7).Equals(Unsafe.As<ulong, Vector128<byte>>(ref other.Id7)))
+            if (!Unsafe.As<ulong, Vector256<byte>>(ref Id0).Equals(Unsafe.As<ulong, Vector256<byte>>(ref other.Id0)))
            {
                return false;
            }
@@ -80,12 +72,7 @@ namespace Ryujinx.Graphics.Vulkan
            ulong hash64 = Id0 * 23 ^
                           Id1 * 23 ^
                           Id2 * 23 ^
-                           Id3 * 23 ^
-                           Id4 * 23 ^
-                           Id5 * 23 ^
-                           Id6 * 23 ^
-                           Id7 * 23 ^
-                           Id8 * 23;
+                           Id3 * 23;
            
            ReadOnlySpan<VertexInputAttributeDescription> vertexAttributeDescriptionsSpan = VertexAttributeDescriptions.AsSpan();

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using PrimitiveTopology = Silk.NET.Vulkan.PrimitiveTopology;

 namespace Ryujinx.Graphics.Vulkan
 {
@@ -538,7 +539,7 @@ namespace Ryujinx.Graphics.Vulkan
        public void CreateBackgroundComputePipeline()
        {
            PipelineState pipeline = new();
-            pipeline.Initialize();
+            pipeline.Initialize(_gd.Capabilities);

            pipeline.Stages[0] = _shaders[0].GetInfo();
            pipeline.StagesCount = 1;
@@ -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;
            }
@@ -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);
            }
@@ -27,6 +27,9 @@ namespace Ryujinx.Graphics.Vulkan
        [GeneratedRegex("NVIDIA GeForce (R|G)?TX? (\\d{3}\\d?)M?")]
        public static partial Regex NvidiaConsumerClassRegex();

+        [GeneratedRegex(@"^\d+\.\d+\.\d+\.\d+$")]
+        internal static partial Regex IntelWindowsDriverVersionRegex();
+
        public static Vendor FromId(uint id)
        {
            return id switch
@@ -71,7 +71,10 @@ namespace Ryujinx.Graphics.Vulkan

                        _buffer = autoBuffer;

-                        state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)stride;
+                        if (!gd.Capabilities.SupportsExtendedDynamicState)
+                        {
+                            state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)stride;
+                        }
                    }

                    return;
@@ -79,8 +82,11 @@ namespace Ryujinx.Graphics.Vulkan

                autoBuffer = gd.BufferManager.GetBuffer(cbs.CommandBuffer, _handle, false, out int size);

-                // The original stride must be reapplied in case it was rewritten.
-                state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)_stride;
+                if (!gd.Capabilities.SupportsExtendedDynamicState)
+                {
+                    // The original stride must be reapplied in case it was rewritten.
+                    state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)_stride;
+                }

                if (_offset >= size)
                {
@@ -101,7 +101,7 @@ namespace Ryujinx.Graphics.Vulkan
                        _strides[i] = strides[i];
                    }

-                    if (_gd.Capabilities.SupportsExtendedDynamicState)
+                    if (_gd.Capabilities.SupportsExtendedDynamicState && (_gd.SupportsMTL31 || !_gd.IsMoltenVk))
                    {
                        _gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
                            cbs.CommandBuffer,
@@ -25,6 +25,7 @@ namespace Ryujinx.Graphics.Vulkan
        [
            ExtConditionalRendering.ExtensionName,
            ExtExtendedDynamicState.ExtensionName,
+            ExtExtendedDynamicState2.ExtensionName,
            ExtTransformFeedback.ExtensionName,
            KhrDrawIndirectCount.ExtensionName,
            KhrPushDescriptor.ExtensionName,
@@ -319,6 +320,17 @@ namespace Ryujinx.Graphics.Vulkan
                features2.PNext = &supportedFeaturesCustomBorderColor;
            }

+            PhysicalDeviceExtendedDynamicState2FeaturesEXT supportedFeaturesExtExtendedDynamicState2 = new()
+            {
+                SType = StructureType.PhysicalDeviceExtendedDynamicState2FeaturesExt,
+                PNext = features2.PNext,
+            };
+
+            if (physicalDevice.IsDeviceExtensionPresent(ExtExtendedDynamicState2.ExtensionName))
+            {
+                features2.PNext = &supportedFeaturesExtExtendedDynamicState2;
+            }
+
            PhysicalDevicePrimitiveTopologyListRestartFeaturesEXT supportedFeaturesPrimitiveTopologyListRestart = new()
            {
                SType = StructureType.PhysicalDevicePrimitiveTopologyListRestartFeaturesExt,
@@ -443,6 +455,7 @@ namespace Ryujinx.Graphics.Vulkan
                TessellationShader = supportedFeatures.TessellationShader,
                VertexPipelineStoresAndAtomics = supportedFeatures.VertexPipelineStoresAndAtomics,
                RobustBufferAccess = useRobustBufferAccess,
+                WideLines = supportedFeatures.WideLines,
                SampleRateShading = supportedFeatures.SampleRateShading,
                ShaderStorageImageExtendedFormats = supportedFeatures.ShaderStorageImageExtendedFormats,
            };
@@ -495,6 +508,20 @@ namespace Ryujinx.Graphics.Vulkan

            pExtendedFeatures = &featuresExtendedDynamicState;

+            if (physicalDevice.IsDeviceExtensionPresent(ExtExtendedDynamicState2.ExtensionName))
+            {
+                var featuresExtendedDynamicState2 = new PhysicalDeviceExtendedDynamicState2FeaturesEXT()
+                {
+                    SType = StructureType.PhysicalDeviceExtendedDynamicState2FeaturesExt,
+                    PNext = pExtendedFeatures,
+                    ExtendedDynamicState2 = supportedFeaturesExtExtendedDynamicState2.ExtendedDynamicState2,
+                    ExtendedDynamicState2LogicOp = supportedFeaturesExtExtendedDynamicState2.ExtendedDynamicState2LogicOp,
+                    ExtendedDynamicState2PatchControlPoints = supportedFeaturesExtExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints,
+                };
+
+                pExtendedFeatures = &featuresExtendedDynamicState2;
+            }
+
            PhysicalDeviceVulkan11Features featuresVk11 = new()
            {
                SType = StructureType.PhysicalDeviceVulkan11Features,
@@ -39,6 +39,7 @@ namespace Ryujinx.Graphics.Vulkan
        internal KhrSwapchain SwapchainApi { get; private set; }
        internal ExtConditionalRendering ConditionalRenderingApi { get; private set; }
        internal ExtExtendedDynamicState ExtendedDynamicStateApi { get; private set; }
+        internal ExtExtendedDynamicState2 ExtendedDynamicState2Api { get; private set; }
        internal KhrPushDescriptor PushDescriptorApi { get; private set; }
        internal ExtTransformFeedback TransformFeedbackApi { get; private set; }
        internal KhrDrawIndirectCount DrawIndirectCountApi { get; private set; }
@@ -105,6 +106,7 @@ namespace Ryujinx.Graphics.Vulkan
        public string GpuDriver { get; private set; }
        public string GpuRenderer { get; private set; }
        public string GpuVersion { get; private set; }
+        public string GpuDriverVersion { get; private set; }

        public bool PreferThreading => true;

@@ -145,6 +147,11 @@ namespace Ryujinx.Graphics.Vulkan
                ExtendedDynamicStateApi = extendedDynamicStateApi;
            }

+            if (Api.TryGetDeviceExtension(_instance.Instance, _device, out ExtExtendedDynamicState2 extendedDynamicState2Api))
+            {
+                ExtendedDynamicState2Api = extendedDynamicState2Api;
+            }
+
            if (Api.TryGetDeviceExtension(_instance.Instance, _device, out KhrPushDescriptor pushDescriptorApi))
            {
                PushDescriptorApi = pushDescriptorApi;
@@ -177,6 +184,14 @@ namespace Ryujinx.Graphics.Vulkan
                SType = StructureType.PhysicalDeviceProperties2,
            };

+            PhysicalDeviceIDProperties propertiesId = new()
+            {
+                SType = StructureType.PhysicalDeviceIDProperties,
+                PNext = properties2.PNext,
+            };
+
+            properties2.PNext = &propertiesId;
+
            PhysicalDeviceSubgroupProperties propertiesSubgroup = new()
            {
                SType = StructureType.PhysicalDeviceSubgroupProperties,
@@ -239,6 +254,11 @@ namespace Ryujinx.Graphics.Vulkan
                SType = StructureType.PhysicalDevicePrimitiveTopologyListRestartFeaturesExt,
            };

+            PhysicalDeviceExtendedDynamicState2FeaturesEXT featuresExtendedDynamicState2 = new()
+            {
+                SType = StructureType.PhysicalDeviceExtendedDynamicState2FeaturesExt,
+            };
+
            PhysicalDeviceRobustness2FeaturesEXT featuresRobustness2 = new()
            {
                SType = StructureType.PhysicalDeviceRobustness2FeaturesExt,
@@ -279,6 +299,12 @@ namespace Ryujinx.Graphics.Vulkan
                features2.PNext = &featuresPrimitiveTopologyListRestart;
            }

+            if (_physicalDevice.IsDeviceExtensionPresent(ExtExtendedDynamicState2.ExtensionName))
+            {
+                featuresExtendedDynamicState2.PNext = features2.PNext;
+                features2.PNext = &featuresExtendedDynamicState2;
+            }
+
            if (_physicalDevice.IsDeviceExtensionPresent("VK_EXT_robustness2"))
            {
                featuresRobustness2.PNext = features2.PNext;
@@ -367,13 +393,17 @@ namespace Ryujinx.Graphics.Vulkan
            GpuVendor = VendorUtils.GetNameFromId(properties.VendorID);
            GpuDriver = hasDriverProperties && !OperatingSystem.IsMacOS() ?
                VendorUtils.GetFriendlyDriverName(driverProperties.DriverID) : GpuVendor; // Fallback to vendor name if driver is unavailable or on MacOS where vendor is preferred.
+            GpuDriverVersion = TryGetIntelWindowsDriverVersionFromUuid(ref propertiesId, out string intelDriverVersion) ? intelDriverVersion :
+                hasDriverProperties ?
+                GetDriverInfo(ref driverProperties) ?? ParseDriverVersion(ref properties) :
+                ParseDriverVersion(ref properties);

            fixed (byte* deviceName = properties.DeviceName)
            {
                GpuRenderer = Marshal.PtrToStringAnsi((nint)deviceName);
            }

-            GpuVersion = $"Vulkan v{ParseStandardVulkanVersion(properties.ApiVersion)}, Driver v{ParseDriverVersion(ref properties)}";
+            GpuVersion = $"Vulkan v{ParseStandardVulkanVersion(properties.ApiVersion)}";

            IsAmdGcn = !IsMoltenVk && Vendor == Vendor.Amd && VendorUtils.AmdGcnRegex().IsMatch(GpuRenderer);

@@ -415,6 +445,10 @@ namespace Ryujinx.Graphics.Vulkan
                properties.Limits.FramebufferDepthSampleCounts &
                properties.Limits.FramebufferStencilSampleCounts;

+            // Temporarily disable this, can be added back at a later date, make it easy to re-enable. 
+            // Disabled because currently causing Device Lost error on NVIDIA. 
+            featuresExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints = false;
+
            Capabilities = new HardwareCapabilities(
                _physicalDevice.IsDeviceExtensionPresent("VK_EXT_index_type_uint8"),
                supportsCustomBorderColor,
@@ -431,6 +465,8 @@ namespace Ryujinx.Graphics.Vulkan
                features2.Features.ShaderStorageImageMultisample,
                _physicalDevice.IsDeviceExtensionPresent(ExtConditionalRendering.ExtensionName),
                _physicalDevice.IsDeviceExtensionPresent(ExtExtendedDynamicState.ExtensionName),
+                featuresExtendedDynamicState2,
+                _physicalDevice.PhysicalDeviceProperties.Limits.MaxTessellationPatchSize,
                features2.Features.MultiViewport && !(IsMoltenVk && Vendor == Vendor.Amd), // Workaround for AMD on MoltenVK issue
                featuresRobustness2.NullDescriptor || IsMoltenVk,
                supportsPushDescriptors,
@@ -446,6 +482,7 @@ namespace Ryujinx.Graphics.Vulkan
                _physicalDevice.IsDeviceExtensionPresent("VK_NV_viewport_array2"),
                _physicalDevice.IsDeviceExtensionPresent(ExtExternalMemoryHost.ExtensionName),
                supportsDepthClipControl && featuresDepthClipControl.DepthClipControl,
+                _physicalDevice.PhysicalDeviceFeatures.WideLines,
                supportsAttachmentFeedbackLoop && featuresAttachmentFeedbackLoop.AttachmentFeedbackLoopLayout && IsFeedbackLoopDevice,
                supportsDynamicAttachmentFeedbackLoop && featuresDynamicAttachmentFeedbackLoop.AttachmentFeedbackLoopDynamicState && IsFeedbackLoopDevice,
                propertiesSubgroup.SubgroupSize,
@@ -785,6 +822,10 @@ namespace Ryujinx.Graphics.Vulkan
                supportsViewportSwizzle: false,
                supportsIndirectParameters: true,
                supportsDepthClipControl: Capabilities.SupportsDepthClipControl,
+                supportsExtendedDynamicState: Capabilities.SupportsExtendedDynamicState,
+                supportsExtendedDynamicState2: Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2,
+                supportsLogicOpDynamicState: Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2LogicOp,
+                supportsPatchControlPointsDynamicState: Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints,
                uniformBufferSetIndex: PipelineBase.UniformSetIndex,
                storageBufferSetIndex: PipelineBase.StorageSetIndex,
                textureSetIndex: PipelineBase.TextureSetIndex,
@@ -824,7 +865,7 @@ namespace Ryujinx.Graphics.Vulkan

        public HardwareInfo GetHardwareInfo()
        {
-            return new HardwareInfo(GpuVendor, GpuRenderer, GpuDriver);
+            return new HardwareInfo(GpuVendor, GpuRenderer, GpuDriver, GpuDriverVersion);
        }

        /// <summary>
@@ -874,9 +915,55 @@ namespace Ryujinx.Graphics.Vulkan
                return $"{(driverVersionRaw >> 22) & 0x3FF}.{(driverVersionRaw >> 14) & 0xFF}.{(driverVersionRaw >> 6) & 0xFF}.{driverVersionRaw & 0x3F}";
            }

+            // Intel's Windows Vulkan driver exposes the 101.xxxx build portion in a custom layout.
+            if (properties.VendorID == 0x8086 && OperatingSystem.IsWindows())
+            {
+                return $"{driverVersionRaw >> 14}.{driverVersionRaw & 0x3FFF}";
+            }
+
            return ParseStandardVulkanVersion(driverVersionRaw);
        }

+        private static unsafe string GetDriverInfo(ref PhysicalDeviceDriverPropertiesKHR driverProperties)
+        {
+            fixed (byte* driverInfo = driverProperties.DriverInfo)
+            {
+                string driverInfoString = Marshal.PtrToStringAnsi((nint)driverInfo);
+
+                return string.IsNullOrWhiteSpace(driverInfoString) ? null : driverInfoString;
+            }
+        }
+
+        private static unsafe bool TryGetIntelWindowsDriverVersionFromUuid(ref PhysicalDeviceIDProperties propertiesId, out string driverVersion)
+        {
+            driverVersion = null;
+
+            if (!OperatingSystem.IsWindows())
+            {
+                return false;
+            }
+
+            fixed (byte* driverUuid = propertiesId.DriverUuid)
+            {
+                string driverUuidString = Marshal.PtrToStringAnsi((nint)driverUuid, (int)Vk.UuidSize);
+                int terminatorIndex = driverUuidString.IndexOf('\0');
+
+                if (terminatorIndex >= 0)
+                {
+                    driverUuidString = driverUuidString[..terminatorIndex];
+                }
+
+                if (VendorUtils.IntelWindowsDriverVersionRegex().IsMatch(driverUuidString))
+                {
+                    driverVersion = driverUuidString;
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
        internal PrimitiveTopology TopologyRemap(PrimitiveTopology topology)
        {
            return topology switch
@@ -902,7 +989,7 @@ namespace Ryujinx.Graphics.Vulkan

        private void PrintGpuInformation()
        {
-            Logger.Notice.Print(LogClass.Gpu, $"{GpuVendor} {GpuRenderer} ({GpuVersion})");
+            Logger.Notice.Print(LogClass.Gpu, $"{GpuVendor} {GpuRenderer} ({GpuVersion}, Driver: {GpuDriver} {GpuDriverVersion})");
            Logger.Notice.Print(LogClass.Gpu, $"GPU Memory: {GetTotalGPUMemory() / (1024 * 1024)} MiB");
        }

@@ -166,13 +166,15 @@ namespace Ryujinx.HLE.HOS.Applets.Error

            string[] buttons = GetButtonsText(module, description, "DlgBtn");

-            bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons);
+            (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);
            if (showDetails)
            {
                message = GetMessageText(module, description, "FlvMsg");
                buttons = GetButtonsText(module, description, "FlvBtn");

-                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons);
+                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
            }
        }

@@ -27,9 +27,19 @@ namespace Ryujinx.HLE.HOS.Applets
            _normalSession = normalSession;
            _interactiveSession = interactiveSession;

-            // TODO(jduncanator): Parse PlayerSelectConfig from input data
-            _normalSession.Push(BuildResponse());
-
+            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));
+            }
            AppletStateChanged?.Invoke(this, null);

            _system.ReturnFocus();
@@ -37,16 +47,34 @@ namespace Ryujinx.HLE.HOS.Applets
            return ResultCode.Success;
        }

-        private byte[] BuildResponse()
+        private byte[] BuildResponse(UserProfile selectedUser)
        {
-            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
-
            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
            using BinaryWriter writer = new(stream);

            writer.Write((ulong)PlayerSelectResult.Success);

-            currentUser.UserId.Write(writer);
+            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);

            return stream.ToArray();
        }
@@ -1,4 +1,5 @@
 using ARMeilleure.Memory;
+using ARMeilleure.Translation.PTC;
 using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Kernel.Process;
@@ -9,12 +10,10 @@ namespace Ryujinx.HLE.HOS
    interface IArmProcessContext : IProcessContext
    {
        IDiskCacheLoadState Initialize(
-            string titleIdText,
-            string displayVersion,
+            PtcCacheInfo cacheInfo,
            bool diskCacheEnabled,
            ulong codeAddress,
-            ulong codeSize,
-            string cacheSelector);
+            ulong codeSize);
    }

    class ArmProcessContext<T> : IArmProcessContext where T : class, IVirtualMemoryManagerTracked, IMemoryManager
@@ -64,15 +63,13 @@ namespace Ryujinx.HLE.HOS
        }

        public IDiskCacheLoadState Initialize(
-            string titleIdText,
-            string displayVersion,
+            PtcCacheInfo cacheInfo,
            bool diskCacheEnabled,
            ulong codeAddress,
-            ulong codeSize,
-            string cacheSelector)
+            ulong codeSize)
        {
            _cpuContext.PrepareCodeRange(codeAddress, codeSize);
-            return _cpuContext.LoadDiskCache(titleIdText, displayVersion, diskCacheEnabled, cacheSelector);
+            return _cpuContext.LoadDiskCache(cacheInfo, diskCacheEnabled);
        }

        public void InvalidateCacheRegion(ulong address, ulong size)
@@ -1,3 +1,4 @@
+using ARMeilleure.Translation.PTC;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Cpu;
@@ -7,6 +8,7 @@ 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;
@@ -17,8 +19,10 @@ namespace Ryujinx.HLE.HOS
    {
        private readonly ITickSource _tickSource;
        private readonly GpuContext _gpu;
-        private readonly string _titleIdText;
+        private readonly ulong _programId;
+        private readonly byte _programIndex;
        private readonly string _displayVersion;
+        private readonly ProcessKind _processKind;
        private readonly bool _diskCacheEnabled;
        private readonly string _diskCacheSelector;
        private readonly ulong _codeAddress;
@@ -29,8 +33,10 @@ namespace Ryujinx.HLE.HOS
        public ArmProcessContextFactory(
            ITickSource tickSource,
            GpuContext gpu,
-            string titleIdText,
+            ulong programId,
+            byte programIndex,
            string displayVersion,
+            ProcessKind processKind,
            bool diskCacheEnabled,
            string diskCacheSelector,
            ulong codeAddress,
@@ -38,8 +44,10 @@ namespace Ryujinx.HLE.HOS
        {
            _tickSource = tickSource;
            _gpu = gpu;
-            _titleIdText = titleIdText;
+            _programId = programId;
+            _programIndex = programIndex;
            _displayVersion = displayVersion;
+            _processKind = processKind;
            _diskCacheEnabled = diskCacheEnabled;
            _diskCacheSelector = diskCacheSelector;
            _codeAddress = codeAddress;
@@ -121,8 +129,18 @@ 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(_titleIdText, _displayVersion, _diskCacheEnabled, _codeAddress, _codeSize, cacheSelector);
+            DiskCacheLoadState = processContext.Initialize(cacheInfo, _diskCacheEnabled, _codeAddress, _codeSize);

            return processContext;
        }
@@ -26,12 +26,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
            {
                MemoryArrange.MemoryArrange4GiB or
                MemoryArrange.MemoryArrange4GiBSystemDev or
-                MemoryArrange.MemoryArrange6GiBAppletDev => 3152 * MiB,
+                MemoryArrange.MemoryArrange6GiBAppletDev => 3236 * MiB,
                MemoryArrange.MemoryArrange4GiBAppletDev => 2048 * MiB,
-                MemoryArrange.MemoryArrange6GiB => 4783 * MiB,
-                MemoryArrange.MemoryArrange8GiB => 6831 * MiB,
-                MemoryArrange.MemoryArrange10GiB => 8879 * MiB,
-                MemoryArrange.MemoryArrange12GiB => 10927 * MiB,
+                MemoryArrange.MemoryArrange6GiB => 4867 * MiB,
+                MemoryArrange.MemoryArrange8GiB => 6915 * MiB,
+                MemoryArrange.MemoryArrange10GiB => 8963 * MiB,
+                MemoryArrange.MemoryArrange12GiB => 11011 * MiB,
                _ => throw new ArgumentException($"Invalid memory arrange \"{arrange}\"."),
            };
        }
@@ -203,7 +203,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                    heapRegion.Size = memConfig switch {
                        MemoryConfiguration.MemoryConfiguration8GiB => 0x200000000u,
                        MemoryConfiguration.MemoryConfiguration10GiB when !isHeapLimited => 0x280000000u,
+                        MemoryConfiguration.MemoryConfiguration10GiB => 0x200000000u,
                        MemoryConfiguration.MemoryConfiguration12GiB when !isHeapLimited => 0x300000000u,
+                        MemoryConfiguration.MemoryConfiguration12GiB => 0x200000000u,
                        _ => 0x180000000u
                    };
                    stackRegion.Size = 0;
@@ -238,7 +240,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                        heapRegion.Size = memConfig switch {
                            MemoryConfiguration.MemoryConfiguration8GiB => 0x200000000u,
                            MemoryConfiguration.MemoryConfiguration10GiB when !isHeapLimited => 0x280000000u,
+                            MemoryConfiguration.MemoryConfiguration10GiB => 0x200000000u,
                            MemoryConfiguration.MemoryConfiguration12GiB when !isHeapLimited => 0x300000000u,
+                            MemoryConfiguration.MemoryConfiguration12GiB => 0x200000000u,
                            _ => 0x180000000u
                        };
                        stackRegion.Size = 1UL << (addressSpaceWidth - 8);
@@ -257,7 +261,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                        heapRegion.Size = memConfig switch {
                            MemoryConfiguration.MemoryConfiguration8GiB => 0x200000000u,
                            MemoryConfiguration.MemoryConfiguration10GiB when !isHeapLimited => 0x280000000u,
+                            MemoryConfiguration.MemoryConfiguration10GiB => 0x200000000u,
                            MemoryConfiguration.MemoryConfiguration12GiB when !isHeapLimited => 0x300000000u,
+                            MemoryConfiguration.MemoryConfiguration12GiB => 0x200000000u,
                            _ => 0x180000000u
                        };
                        stackRegion.Size = 0x80000000;
@@ -15,7 +15,6 @@ 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)
        {
@@ -23,7 +22,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading

            _condVarThreads = [];
            _arbiterThreads = [];
-            _byDynamicPriority = new ByDynamicPriority();
        }

        public Result ArbitrateLock(int ownerHandle, ulong mutexAddress, int requesterHandle)
@@ -142,14 +140,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading

            if (_condVarThreads.TryGetValue(condVarAddress, out List<KThread> threads))
            {
-                int i = 0;
+                int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
+

-                if (threads.Count > 0)
-                {
-                    i = threads.BinarySearch(currentThread, _byDynamicPriority);
-                    if (i < 0) i = ~i;
-                }
-                
                threads.Insert(i, currentThread);
            }
            else
@@ -332,14 +325,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                
                if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
                {
-                    int i = 0;
+                    int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
+

-                    if (threads.Count > 0)
-                    {
-                        i = threads.BinarySearch(currentThread, _byDynamicPriority);
-                        if (i < 0) i = ~i;
-                    }
-                
                    threads.Insert(i, currentThread);
                }
                else
@@ -424,14 +412,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                
                if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
                {
-                    int i = 0;
+                    int i = FindDynamicPriorityFifoInsertionIndex(threads, currentThread);
+

-                    if (threads.Count > 0)
-                    {
-                        i = threads.BinarySearch(currentThread, _byDynamicPriority);
-                        if (i < 0) i = ~i;
-                    }
-                
                    threads.Insert(i, currentThread);
                }
                else
@@ -627,12 +610,28 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
            return validCount;
        }
        
-        private class ByDynamicPriority : IComparer<KThread>
+        private static int FindDynamicPriorityFifoInsertionIndex(List<KThread> threads, KThread currentThread)
        {
-            public int Compare(KThread x, KThread y)
+            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)
            {
-                return x!.DynamicPriority.CompareTo(y!.DynamicPriority);
+                int middle = low + ((high - low) >> 1);
+
+                if (threads[middle].DynamicPriority <= currentThread.DynamicPriority)
+                {
+                    low = middle + 1;
+                }
+                else
+                {
+                    high = middle;
+                }
            }
+
+            return low;
        }
    }
 }
@@ -783,8 +783,28 @@ namespace Ryujinx.HLE.HOS
            }

            List<Cheat> cheats = mods.Cheats;
-            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);
+            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);
+            }

            foreach (Cheat cheat in cheats)
            {
@@ -71,7 +71,14 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
            return _applicationServiceServer.IsUserRegistrationRequestPermitted(context);
        }

-        [CommandCmif(51)]
+        [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+
        // TrySelectUserWithoutInteraction(bool) -> nn::account::Uid
        public ResultCode TrySelectUserWithoutInteraction(ServiceCtx context)
        {
@@ -12,12 +12,23 @@ 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;
@@ -153,6 +164,47 @@ 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)
@@ -177,8 +229,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 turned off the backlight.
-            //       Since we don't support backlight, it's fine to do nothing.
+            // 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.

            _lcdBacklighOffEnabled = context.RequestData.ReadBoolean();

@@ -298,18 +350,43 @@ 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)
@@ -320,6 +397,100 @@ 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)
@@ -21,6 +21,21 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
            return ResultCode.Success;
        }

+        [CommandCmif(3)] // 20.0.0+
+        // CreateLibraryAppletEx(u32, u32, u64) -> object<nn::am::service::ILibraryAppletAccessor>
+        public ResultCode CreateLibraryAppletEx(ServiceCtx context)
+        {
+            AppletId appletId = (AppletId)context.RequestData.ReadInt32();
+
+            _ = context.RequestData.ReadInt32(); // libraryAppletMode
+
+            _ = context.RequestData.ReadUInt64(); // threadId
+
+            MakeObject(context, new ILibraryAppletAccessor(appletId, context.Device.System));
+
+            return ResultCode.Success;
+        }
+
        [CommandCmif(10)]
        // CreateStorage(u64) -> object<nn::am::service::IStorage>
        public ResultCode CreateStorage(ServiceCtx context)
@@ -0,0 +1,80 @@
+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;
+        }
+    }
+}
@@ -32,5 +32,6 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
        DetectShortPressingCaptureButton = 90,
        AlbumScreenShotTaken = 92,
        AlbumRecordingSaved = 93,
+        StartupLogoDisappeared = 95, // 21.0.0+
    }
 }
@@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
        private readonly bool[] _supportedPlayers;
        private VibrationValue _neutralVibrationValue = new()
        {
-            AmplitudeLow = 0f,
+            AmplitudeLow = 0.01f,
            FrequencyLow = 160f,
            AmplitudeHigh = 0f,
            FrequencyHigh = 320f,
@@ -7,6 +7,7 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.Loaders.Executables;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
 using System.Collections.Concurrent;
@@ -23,7 +24,62 @@ namespace Ryujinx.HLE.Loaders.Processes

        private ulong _latestPid;

-        public ProcessResult ActiveApplication => _processesByPid[_latestPid];
+        private readonly object _pidLock = new();
+
+#nullable enable
+        public ProcessResult? ActiveApplication
+        {
+            get
+            {
+                lock (_pidLock)
+                {
+                    // Check if _latestPid is still valid
+                    if (_latestPid == 0)
+                    {
+                        return null;
+                    }
+
+                    // Verify process still exists in kernel (authoritative source)
+                    if (!_device.System.KernelContext.Processes.TryGetValue(_latestPid, out HOS.Kernel.Process.KProcess? kernelProcess))
+                    {
+                        // Process no longer exists in kernel, clear stale state
+                        Logger.Warning?.Print(LogClass.Loader,
+                            $"ActiveApplication PID {_latestPid} no longer exists in kernel, clearing stale state");
+
+                        _processesByPid.TryRemove(_latestPid, out _);
+                        _latestPid = 0;
+
+                        return null;
+                    }
+
+                    // Verify process still exists in ProcessLoader's dictionary
+                    if (_processesByPid.TryGetValue(_latestPid, out ProcessResult? processResult))
+                    {
+                        // Additional check: verify process state
+                        if (kernelProcess.State == HOS.Kernel.Process.ProcessState.Exited ||
+                            kernelProcess.State == HOS.Kernel.Process.ProcessState.Exiting)
+                        {
+                            Logger.Warning?.Print(LogClass.Loader,
+                                $"ActiveApplication PID {_latestPid} is in state {kernelProcess.State}, clearing");
+
+                            _processesByPid.TryRemove(_latestPid, out _);
+                            _latestPid = 0;
+
+                            return null;
+                        }
+
+                        return processResult;
+                    }
+
+                    // Fallback: clear stale PID if not in our dictionary
+                    Logger.Warning?.Print(LogClass.Loader,
+                        $"ActiveApplication PID {_latestPid} not in ProcessLoader dictionary, clearing");
+                    _latestPid = 0;
+                    return null;
+                }
+            }
+        }
+#nullable disable

        public ProcessLoader(Switch device)
        {
@@ -226,7 +282,7 @@ namespace Ryujinx.HLE.Loaders.Processes
            }

            // Explicitly null TitleId to disable the shader cache.
-            Graphics.Gpu.GraphicsConfig.TitleId = null;
+            GraphicsConfig.TitleId = null;
            _device.Gpu.HostInitalized.Set();

            ProcessResult processResult = ProcessLoaderHelper.LoadNsos(_device,
@@ -265,5 +321,37 @@ namespace Ryujinx.HLE.Loaders.Processes

            return false;
        }
+
+        /// <summary>
+        /// Clears a specific process from the ProcessLoader's tracking.
+        /// This should be called when a process exits or is terminated.
+        /// </summary>
+        /// <param name="pid">The process ID to clear</param>
+        public void ClearProcess(ulong pid)
+        {
+            lock (_pidLock)
+            {
+                if (_processesByPid.TryRemove(pid, out _))
+                {
+                    if (_latestPid == pid)
+                    {
+                        _latestPid = 0;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Clears all processes from the ProcessLoader's tracking.
+        /// This should be called during system shutdown.
+        /// </summary>
+        public void ClearAllProcesses()
+        {
+            lock (_pidLock)
+            {
+                _processesByPid.Clear();
+                _latestPid = 0;
+            }
+        }
    }
 }
@@ -182,8 +182,10 @@ namespace Ryujinx.HLE.Loaders.Processes
            ArmProcessContextFactory processContextFactory = new(
                context.Device.System.TickSource,
                context.Device.Gpu,
-                string.Empty,
-                string.Empty,
+                kip.ProgramId,
+                0,
+                kip.Version.ToString(),
+                ProcessResult.GetProcessKind(kip.ProgramId),
                false,
                null,
                codeAddress,
@@ -377,8 +379,10 @@ namespace Ryujinx.HLE.Loaders.Processes
            ArmProcessContextFactory processContextFactory = new(
                context.Device.System.TickSource,
                context.Device.Gpu,
-                $"{programId:x16}",
+                programId,
+                programIndex,
                displayVersion,
+                ProcessResult.GetProcessKind(programId),
                diskCacheEnabled,
                diskCacheSelector,
                codeStart,
@@ -87,7 +87,7 @@ namespace Ryujinx.HLE.Loaders.Processes
            AllowCodeMemoryForJit = allowCodeMemoryForJit;
        }

-        private static ProcessKind GetProcessKind(ulong programId)
+        internal static ProcessKind GetProcessKind(ulong programId)
        {
            if (programId == 0)
            {
@@ -59,6 +59,7 @@
    <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>
@@ -208,6 +208,7 @@ namespace Ryujinx.HLE
        {
            if (disposing)
            {
+                Processes.ClearAllProcesses();
                System.Dispose();
                AudioDeviceDriver.Dispose();
                FileSystem.Dispose();
@@ -1,4 +1,5 @@
 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
@@ -48,7 +49,8 @@ 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>
-        bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText);
+        // ReSharper disable once UnusedParameter.Global
+        bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText, (uint Module, uint Description)? errorCode = null);

        /// <summary>
        /// Creates a handler to process keyboard inputs into text strings.
@@ -65,5 +67,10 @@ 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();
    }
 }
@@ -1,3 +1,4 @@
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Hid;
 using SDL;
 using static SDL.SDL3;
@@ -12,140 +13,276 @@ 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)
        {
-            ushort vendor = SDL_GetGamepadVendor(gamepadHandle);
-            if (vendor != 0x057e)
+            _vendor = SDL_GetGamepadVendor(gamepadHandle);
+            if (!Enum.IsDefined(typeof(HDRumbleSupportedVendor), _vendor))
            {
                return null;
            }

-            ushort product = SDL_GetGamepadProduct(gamepadHandle);
-            if (product != 0x2006 && product != 0x2007 && product != 0x2009 && product != 0x200e)
+            _product = SDL_GetGamepadProduct(gamepadHandle);
+            if (!Enum.IsDefined(typeof(HDRumbleSupportedProduct), _product))
            {
                return null;
            }

-            return new NpadHdRumble(SDL_hid_open(vendor, product, 0));
+            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));
        }

        // Some of the code was translated from https://github.com/MIZUSHIKI/JoyShockLibrary-plus-HDRumble
-        private void WriteHdRumble(
-            int encLeftLowFreq, int encLeftLowAmp,
-            int encLeftHighFreq, int encLeftHighAmp,
-            int encRightLowFreq, int encRightLowAmp,
-            int encRightHighFreq, int encRightHighAmp)
+        private bool WriteNintendoHdRumble(VibrationValue left, VibrationValue right)
        {
-            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);
-
+            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);
+            
            if (_globalCount > 0xF)
            {
                _globalCount = 0x0;
            }
-
-            fixed (byte* ptr = buf)
+            
+            fixed (byte* ptr = _buffer)
            {
-                SDL_hid_write(_hidHandle, ptr, (nuint)buf.Length);
+                if (SendHdRumble(ptr, (nuint)_buffer.Length) >= 0)
+                {
+                    return true;
+                }
+                
+                Logger.Error?.PrintMsg(LogClass.Hid, SDL_GetError());
+                SDL_ClearError();
            }
+            
+            return false;
        }

-
        private static int EncodeLowFreq(float lowFreq)
        {
-            float lf = Math.Clamp(lowFreq, 40.875885f, 626.286133f);
-            return (int)Math.Round(32 * Math.Log2(lf * 0.1f)) - 0x40;
+            return (int)Math.Clamp(32 * Math.Log2(lowFreq * 0.1f) - 0x40, 81.75177f, 1252.572266f);
        }

        private static int EncodeHighFreq(float highFreq)
        {
-            float hf = Math.Clamp(highFreq, 81.75177f, 1252.572266f);
-            return ((int)Math.Round(32 * Math.Log2(hf * 0.1f)) - 0x60) * 4;
+            return (int)Math.Clamp(32 * Math.Log2(highFreq * 0.1f) - 0x60, 81.75177f, 1252.572266f);
        }

        private static int EncodeLowAmp(float rawAmp)
        {
-            int encodedAmp = 0;
+            double encodedAmp = 0;

            if (rawAmp is > 0 and < 0.012f)
-            {
                encodedAmp = 1;
-            }
+            
            else if (rawAmp is >= 0.012f and < 0.112f)
-            {
-                encodedAmp = (int)Math.Round(4 * Math.Log2(rawAmp * 110f));
-            }
+                encodedAmp = 4 * Math.Log2(rawAmp * 110f);
+            
            else if (rawAmp is >= 0.112f and < 0.225f)
-            {
-                encodedAmp = (int)Math.Round(16 * Math.Log2(rawAmp * 17f));
-            }
+                encodedAmp = 16 * Math.Log2(rawAmp * 17f);
+            
            else if (rawAmp is >= 0.225f and <= 1f)
-            {
-                encodedAmp = (int)Math.Round(32 * Math.Log2(rawAmp * 8.7f));
-            }
-
-            return (int)Math.Floor(encodedAmp / 2.0) + 64;
+                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);
        }

        private static int EncodeHighAmp(float rawAmp)
        {
-            int encodedAmp = 0;
+            double encodedAmp = 0;

            if (rawAmp is > 0 and < 0.012f)
-            {
                encodedAmp = 1;
-            }
+            
            else if (rawAmp is >= 0.012f and < 0.112f)
-            {
-                encodedAmp = (int)Math.Round(4 * Math.Log2(rawAmp * 110f));
-            }
+                encodedAmp = 4 * Math.Log2(rawAmp * 110f);
+            
            else if (rawAmp is >= 0.112f and < 0.225f)
-            {
-                encodedAmp = (int)Math.Round(16 * Math.Log2(rawAmp * 17f));
-            }
+                encodedAmp = 16 * Math.Log2(rawAmp * 17f);
+            
            else if (rawAmp is >= 0.225f and <= 1f)
-            {
-                encodedAmp = (int)Math.Round(32 * Math.Log2(rawAmp * 8.7f));
-            }
-
-            return encodedAmp * 2;
+                encodedAmp = 32 * Math.Log2(rawAmp * 8.7f);
+            
+            encodedAmp = Math.Round(encodedAmp / 2.0);
+            encodedAmp = Math.Clamp(encodedAmp, 0.0, 100.2867);
+            return (int)encodedAmp;
        }

        public bool HdRumble(VibrationValue left, VibrationValue right)
        {
-            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;
+            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;
        }

        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
+    }
 }
@@ -177,10 +177,12 @@ namespace Ryujinx.Input.SDL3
            return _hdRumble?.HdRumble(left, right) ?? false;
        }

-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
        {
            if ((Features & GamepadFeaturesFlag.Rumble) == 0)
-                return;
+            {
+                return false;
+            }

            ushort lowFrequencyRaw = (ushort)(lowFrequency * ushort.MaxValue);
            ushort highFrequencyRaw = (ushort)(highFrequency * ushort.MaxValue);
@@ -199,6 +201,15 @@ 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)
@@ -163,7 +163,7 @@ namespace Ryujinx.Input.SDL3

        public void SetTriggerThreshold(float triggerThreshold)
        {
-
+            // No operations
        }
        
        public bool HDRumble(VibrationValue left, VibrationValue right)
@@ -171,10 +171,12 @@ namespace Ryujinx.Input.SDL3
            return _hdRumble?.HdRumble(left, right) ?? false;
        }

-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
        {
            if ((Features & GamepadFeaturesFlag.Rumble) == 0)
-                return;
+            {
+                return false;
+            }

            ushort lowFrequencyRaw = (ushort)(lowFrequency * ushort.MaxValue);
            ushort highFrequencyRaw = (ushort)(highFrequency * ushort.MaxValue);
@@ -193,6 +195,15 @@ 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)
@@ -1,4 +1,7 @@
-using Ryujinx.Common.Configuration.Hid;
+using Gommon;
+using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.Hid;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
@@ -61,7 +64,14 @@ namespace Ryujinx.Input.SDL3
            return left.IsPressed(inputId) || right.IsPressed(inputId);
        }

-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        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)
        {
            if (lowFrequency != 0)
            {
@@ -78,6 +88,15 @@ 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)
@@ -1,6 +1,7 @@
 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;
@@ -385,9 +386,14 @@ namespace Ryujinx.Input.SDL3
            // No operations
        }

-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public bool HDRumble(VibrationValue left, VibrationValue right)
        {
-            // No operations
+            return false;
+        }
+        
+        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        {
+            return false;
        }

        public Vector3 GetMotionData(MotionInputId inputId)
@@ -1,4 +1,5 @@
 using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.HLE.HOS.Services.Hid;
 using System;
 using System.Drawing;
 using System.Numerics;
@@ -66,7 +67,12 @@ namespace Ryujinx.Input.SDL3
            throw new NotImplementedException();
        }

-        public void Rumble(float lowFrequency, float highFrequency, uint durationMs)
+        public bool HDRumble(VibrationValue left, VibrationValue right)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Rumble(float lowFrequency, float highFrequency, uint durationMs)
        {
            throw new NotImplementedException();
        }
@@ -554,34 +554,38 @@ namespace Ryujinx.Input.HLE
        {
            if (queue.TryDequeue(out (VibrationValue, VibrationValue) dualVibrationValue))
            {
-                if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Rumble.EnableRumble)
+                if (_config is not StandardControllerInputConfig controllerConfig ||
+                    !controllerConfig.Rumble.EnableRumble)
                {
-                    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}");
+                    return;
                }
+
+                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})");
            }
        }
    }
@@ -71,10 +71,7 @@ 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)
-        {
-            return false;
-        }
+        bool HDRumble(VibrationValue left, VibrationValue right);

        /// <summary>
        /// Starts a rumble effect on the gamepad.
@@ -82,10 +79,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>
-        void Rumble(float lowFrequency, float highFrequency, uint durationMs);
+        bool Rumble(float lowFrequency, float highFrequency, uint durationMs);

        /// <summary>
-        /// 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)"/>.
+        /// 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)"/>.
        /// </summary>
        /// <returns>A remapped snaphost of the state of the gamepad.</returns>
        GamepadStateSnapshot GetMappedStateSnapshot();
@@ -1422,6 +1422,7 @@ namespace Ryujinx.UI.Common.Configuration
                            EnableRumble = false,
                            StrongRumble = 1f,
                            WeakRumble = 1f,
+                            UseHDRumble = false
                        };
                    }
                }
@@ -15,6 +15,9 @@ 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; }
@@ -45,6 +48,20 @@ 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;
@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.HLE.Loaders.Processes;
 using System;

@@ -26,5 +27,23 @@ 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);
+        }
    }
 }
@@ -14,6 +14,7 @@ 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;
@@ -45,6 +45,7 @@ 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;
@@ -654,8 +655,22 @@ namespace Ryujinx.Ava

            if (RendererHost.EmbeddedWindow is EmbeddedWindowOpenGL openGlWindow)
            {
-                // Try to bind the OpenGL context before calling the shutdown event.
-                openGlWindow.MakeCurrent(false, false);
+                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;
+                }

                Device.DisposeGpu();

@@ -1075,9 +1090,10 @@ namespace Ryujinx.Ava
        {
            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                if (_viewModel.StartGamesInFullscreen)
+                if (_viewModel.StartGamesInFullscreen && _viewModel.WindowState is not WindowState.FullScreen)
                {
-                    _viewModel.WindowState = WindowState.FullScreen;
+                    // Use the view model toggle so decoration ordering matches user toggles.
+                    _viewModel.ToggleFullscreen();
                }

                if (_viewModel.WindowState == WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
@@ -462,6 +462,8 @@
  "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",
@@ -932,5 +934,9 @@
  "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."
+  "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."
 }
@@ -807,5 +807,9 @@
  "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."
+  "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."
 }
@@ -828,5 +828,9 @@
  "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."
+  "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."
 }
@@ -223,6 +223,7 @@ namespace Ryujinx.Headless
                            StrongRumble = 1f,
                            WeakRumble = 1f,
                            EnableRumble = false,
+                            UseHDRumble = true
                        },
                    };
                }
--- a/Show More
+++ b/Show More