Merge 48f9ada59b into 9c8055440e

Not functional yet. This is the UI & persistence side of #572.

.github/workflows/canary.yml

@@ -202,7 +202,7 @@ jobs:
 
   macos_release:
     name: Release MacOS universal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/release.yml

@@ -183,7 +183,7 @@ jobs:
 
   macos_release:
     name: Release MacOS universal
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
 

docs/compatibility.csv

@@ -1070,6 +1070,7 @@
 010017B0102A8000,"Emma: Lost in Memories",nvdec,playable,2021-01-28 16:19:10
 010068300E08E000,"Enchanted in the Moonlight - Kiryu, Chikage & Yukinojo -",gpu;nvdec,ingame,2022-11-20 16:18:45
 01007A4008486000,"Enchanting Mahjong Match",gpu,ingame,2020-04-17 22:01:31
+0100EF901E552000,"ENDER MAGNOLIA: Bloom in the Mist",deadlock,boots,2025-01-22 17:59:00
 01004F3011F92000,"Endless Fables: Dark Moor",gpu;nvdec,ingame,2021-03-07 15:31:03
 010067B017588000,"Endless Ocean™ Luminous",services-horizon;crash,ingame,2024-05-30 02:05:57
 0100B8700BD14000,"Energy Cycle Edge",services,ingame,2021-11-30 05:02:31
@@ -2681,7 +2682,7 @@
 01005EA01C0FC000,"SONIC X SHADOW GENERATIONS",crash,ingame,2025-01-07 04:20:45
 010064F00C212000,"Soul Axiom Rebooted",nvdec;slow,ingame,2020-09-04 12:41:01
 0100F2100F0B2000,"Soul Searching",,playable,2020-07-09 18:39:07
-01008F2005154000,"South Park™: The Fractured but Whole™ - Standard Edition",slow;online-broken,playable,2024-07-08 17:47:28
+01008F2005154000,"South Park™: The Fractured but Whole™ - Standard Edition",slow;online-broken;vulkan-backend-bug;gpu,ingame,2025-01-21 17:35:10
 0100B9F00C162000,"Space Blaze",,playable,2020-08-30 16:18:05
 010005500E81E000,"Space Cows",UE4;crash,menus,2020-06-15 11:33:20
 0100707011722000,"Space Elite Force",,playable,2020-11-27 15:21:05

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

@@ -78,5 +78,10 @@ namespace Ryujinx.Common.Configuration.Hid.Controller
         /// Controller Rumble Settings
         /// </summary>
         public RumbleConfigController Rumble { get; set; }
+        
+        /// <summary>
+        /// Controller LED Settings
+        /// </summary>
+        public LedConfigController Led { get; set; }
     }
 }

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

@@ -0,0 +1,15 @@
+namespace Ryujinx.Common.Configuration.Hid.Controller
+{
+    public class LedConfigController
+    {
+        /// <summary>
+        ///     Packed RGB int of the color
+        /// </summary>
+        public uint LedColor { get; set; }
+
+        /// <summary>
+        /// Enable LED color changing by the emulator
+        /// </summary>
+        public bool EnableLed { get; set; }
+    }
+}

src/Ryujinx.Common/TitleIDs.cs

@@ -14,6 +14,7 @@ namespace Ryujinx.Common
         {
             switch (currentBackend)
             {
+                case GraphicsBackend.Metal when !OperatingSystem.IsMacOS():
                 case GraphicsBackend.OpenGl when OperatingSystem.IsMacOS():
                     return GraphicsBackend.Vulkan;
                 case GraphicsBackend.Vulkan or GraphicsBackend.OpenGl or GraphicsBackend.Metal:
@@ -28,18 +29,28 @@ namespace Ryujinx.Common
         
         public static readonly string[] GreatMetalTitles =
         [
-            "01006f8002326000", // Animal Crossings: New Horizons
-            "01009bf0072d4000", // Captain Toad: Treasure Tracker
+            "010076f0049a2000", // Bayonetta
             "0100a5c00d162000", // Cuphead
             "010023800d64a000", // Deltarune
+            "01003a30012c0000", // LEGO City Undercover
             "010028600EBDA000", // Mario 3D World
             "0100152000022000", // Mario Kart 8 Deluxe
-            "01005CA01580E000", // Persona 5
-            "0100187003A36000", // Pokémon: Let's Go, Evoli!
+            "010075a016a3a000", // Persona 4 Arena Ultimax
+            "0100187003A36000", // Pokémon: Let's Go, Eevee!
             "010003f003a34000", // Pokémon: Let's Go, Pikachu!
             "01008C0016544000", // Sea of Stars
             "01006A800016E000", // Smash Ultimate
-            "0100000000010000", // Super Mario Odyessy
+            "01006bb00c6f0000", // The Legend of Zelda: Link's Awakening
+
+            // These ones have small issues, but those happen on Vulkan as well:
+            "01006f8002326000", // Animal Crossings: New Horizons
+            "01009bf0072d4000", // Captain Toad: Treasure Tracker
+            "01009510001ca000", // Fast RMX
+            "01005CA01580E000", // Persona 5 Royale
+            "0100000000010000", // Super Mario Odyssey
+
+            //Isaac claims it has a issue in level 2, but I am not able to replicate it on my M3. More testing would be appreciated:
+            "010015100b514000", // Super Mario Bros. Wonder
         ];
         
         public static string GetDiscordGameAsset(string titleId) 
@@ -47,72 +58,87 @@ namespace Ryujinx.Common
 
         public static readonly string[] DiscordGameAssetKeys =
         [
+                //All games are in Alphabetical order by Game name.
+            
+                          //Dragon Quest Franchise
             "010008900705c000", // Dragon Quest Builders
             "010042000a986000", // Dragon Quest Builders 2
             
-            "010055d009f78000", // Fire Emblem: Three Houses
-            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
+                          //Fire Emblem Franchise
             "0100a6301214e000", // Fire Emblem Engage
+            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
+            "010055d009f78000", // Fire Emblem: Three Houses
             "0100f15003e64000", // Fire Emblem Warriors
             "010071f0143ea000", // Fire Emblem Warriors: Three Hopes
-
-            "01007e3006dda000", // Kirby Star Allies
+ 
+                          //Kirby Franchise
             "01004d300c5ae000", // Kirby and the Forgotten Land
-            "01006b601380e000", // Kirby's Return to Dream Land Deluxe
-            "01003fb00c5a8000", // Super Kirby Clash
-            "0100227010460000", // Kirby Fighters 2
             "0100a8e016236000", // Kirby's Dream Buffet
-
+            "0100227010460000", // Kirby Fighters 2
+            "01006b601380e000", // Kirby's Return to Dream Land Deluxe
+            "01007e3006dda000", // Kirby Star Allies
+            "01003fb00c5a8000", // Super Kirby Clash
+            
+            
+                          //The Zelda Franchise
+            "01000b900d8b0000", // Cadence of Hyrule
+            "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
+            "01002b00111a2000", // Hyrule Warriors: Age of Calamity
             "01007ef00011e000", // The Legend of Zelda: Breath of the Wild
             "01006bb00c6f0000", // The Legend of Zelda: Link's Awakening
             "01002da013484000", // The Legend of Zelda: Skyward Sword HD
             "0100f2c0115b6000", // The Legend of Zelda: Tears of the Kingdom
             "01008cf01baac000", // The Legend of Zelda: Echoes of Wisdom
-            "01000b900d8b0000", // Cadence of Hyrule
-            "0100ae00096ea000", // Hyrule Warriors: Definitive Edition
-            "01002b00111a2000", // Hyrule Warriors: Age of Calamity
+            
 
+                          //Luigi Franchise
             "010048701995e000", // Luigi's Mansion 2 HD
             "0100dca0064a6000", // Luigi's Mansion 3
 
+                          //Metroid Franchise
             "010093801237c000", // Metroid Dread
             "010012101468c000", // Metroid Prime Remastered
 
-            "0100000000010000", // SUPER MARIO ODYSSEY
-            "0100ea80032ea000", // Super Mario Bros. U Deluxe
-            "01009b90006dc000", // Super Mario Maker 2
-            "010049900f546000", // Super Mario 3D All-Stars
-            "010049900F546001", // ^ 64
-            "010049900F546002", // ^ Sunshine
-            "010049900F546003", // ^ Galaxy
-            "010028600ebda000", // Super Mario 3D World + Bowser's Fury
-            "010015100b514000", // Super Mario Bros. Wonder
-            "0100152000022000", // Mario Kart 8 Deluxe
-            "010036b0034e4000", // Super Mario Party
-            "01006fe013472000", // Mario Party Superstars
-            "0100965017338000", // Super Mario Party Jamboree
+                          //Monster Hunter Franchise
+            "0100770008dd8000", // Monster Hunter Generations Ultimate
+            "0100b04011742000", // Monster Hunter Rise 
+                          
+                          //Mario Franchise
             "01006d0017f7a000", // Mario & Luigi: Brothership
+            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
             "010067300059a000", // Mario + Rabbids: Kingdom Battle
             "0100317013770000", // Mario + Rabbids: Sparks of Hope
+            "0100c9c00e25c000", // Mario Golf: Super Rush
+            "0100152000022000", // Mario Kart 8 Deluxe
+            "01006fe013472000", // Mario Party Superstars
+            "010019401051c000", // Mario Strikers: Battle League
+            "0100bde00862a000", // Mario Tennis Aces
+            "0100b99019412000", // Mario vs. Donkey Kong
+            "010049900f546000", // Super Mario 3D All-Stars
+            "010028600ebda000", // Super Mario 3D World + Bowser's Fury
+            "010049900F546001", // Super Mario 64
+            "0100ea80032ea000", // Super Mario Bros. U Deluxe
+            "010015100b514000", // Super Mario Bros. Wonder
+            "010049900F546003", // Super Mario Galaxy
+            "01009b90006dc000", // Super Mario Maker 2
+            "0100000000010000", // SUPER MARIO ODYSSEY
+            "010036b0034e4000", // Super Mario Party
+            "0100965017338000", // Super Mario Party Jamboree
+            "0100bc0018138000", // Super Mario RPG
+            "010049900F546002", // Super Mario Sunshine
             "0100a3900c3e2000", // Paper Mario: The Origami King
             "0100ecd018ebe000", // Paper Mario: The Thousand-Year Door
-            "0100bc0018138000", // Super Mario RPG
-            "0100bde00862a000", // Mario Tennis Aces
-            "0100c9c00e25c000", // Mario Golf: Super Rush
-            "010019401051c000", // Mario Strikers: Battle League
-            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
-            "0100b99019412000", // Mario vs. Donkey Kong
 
+                          //Pikmin Franchise
             "0100aa80194b0000", // Pikmin 1
             "0100d680194b2000", // Pikmin 2
             "0100f4c009322000", // Pikmin 3 Deluxe
             "0100b7c00933a000", // Pikmin 4
 
+                          //The Pokémon Franchise
             "0100f4300bf2c000", // New Pokémon Snap
             "0100000011d90000", // Pokémon Brilliant Diamond
             "01001f5010dfa000", // Pokémon Legends: Arceus
-            "010003f003a34000", // Pokémon: Let's Go Pikachu!
-            "0100187003a36000", // Pokémon: Let's Go Eevee!
             "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
             "0100a3d008c5c000", // Pokémon Scarlet
             "01008db008c2c000", // Pokémon Shield
@@ -120,24 +146,29 @@ namespace Ryujinx.Common
             "0100abf008968000", // Pokémon Sword
             "01008f6008c5e000", // Pokémon Violet
             "0100b3f000be2000", // Pokkén Tournament DX
+            "0100187003a36000", // Pokémon: Let's Go Eevee!
+            "010003f003a34000", // Pokémon: Let's Go Pikachu!
 
-            "01003bc0000a0000", // Splatoon 2 (US)
+                          //Splatoon Franchise
             "0100f8f0000a2000", // Splatoon 2 (EU)
             "01003c700009c000", // Splatoon 2 (JP)
+            "01003bc0000a0000", // Splatoon 2 (US)
             "0100c2500fc20000", // Splatoon 3
             "0100ba0018500000", // Splatoon 3: Splatfest World Premiere
 
-            "010040600c5ce000", // Tetris 99
-            "0100277011f1a000", // Super Mario Bros. 35
-            "0100ad9012510000", // PAC-MAN 99
+                          //NSO Membership games
             "0100ccf019c8c000", // F-ZERO 99
-            "0100d870045b6000", // NES - Nintendo Switch Online
-            "01008d300c50c000", // SNES - Nintendo Switch Online
-            "0100c9a00ece6000", // N64 - Nintendo Switch Online
-            "0100e0601c632000", // N64 - Nintendo Switch Online 18+
             "0100c62011050000", // GB - Nintendo Switch Online
             "010012f017576000", // GBA - Nintendo Switch Online
+            "0100c9a00ece6000", // N64 - Nintendo Switch Online
+            "0100e0601c632000", // N64 - Nintendo Switch Online 18+
+            "0100d870045b6000", // NES - Nintendo Switch Online
+            "0100ad9012510000", // PAC-MAN 99
+            "010040600c5ce000", // Tetris 99
+            "01008d300c50c000", // SNES - Nintendo Switch Online
+            "0100277011f1a000", // Super Mario Bros. 35
 
+                          //Misc Nintendo 1st party games
             "01000320000cc000", // 1-2 Switch
             "0100300012f2a000", // Advance Wars 1+2: Re-Boot Camp
             "01006f8002326000", // Animal Crossing: New Horizons
@@ -152,27 +183,32 @@ namespace Ryujinx.Common
             "01006a800016e000", // Super Smash Bros. Ultimate
             "0100a9400c9c2000", // Tokyo Mirage Sessions #FE Encore
 
+                          //Bayonetta Franchise
             "010076f0049a2000", // Bayonetta
             "01007960049a0000", // Bayonetta 2
             "01004a4010fea000", // Bayonetta 3
             "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
 
+                          //Persona Franchise
             "0100dcd01525a000", // Persona 3 Portable
-            "010062b01525c000", // Persona 4 Golden
             "010075a016a3a000", // Persona 4 Arena Ultimax
+            "010062b01525c000", // Persona 4 Golden
             "01005ca01580e000", // Persona 5 Royal
             "0100801011c3e000", // Persona 5 Strikers
             "010087701b092000", // Persona 5 Tactica
 
-            "01009aa000faa000", // Sonic Mania
+                          //Sonic Franchise
             "01004ad014bf0000", // Sonic Frontiers
+            "01009aa000faa000", // Sonic Mania
             "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
             "01005ea01c0fc001", // ^
 
+                          //Xenoblade Franchise
             "0100ff500e34a000", // Xenoblade Chronicles - Definitive Edition
             "0100e95004038000", // Xenoblade Chronicles 2
             "010074f013262000", // Xenoblade Chronicles 3
 
+                          //Misc Games
             "010056e00853a000", // A Hat in Time
             "0100fd1014726000", // Baldurs Gate: Dark Alliance
             "0100dbf01000a000", // Burnout Paradise Remastered
@@ -185,8 +221,6 @@ namespace Ryujinx.Common
             "01003620068ea000", // Hand of Fate 2
             "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
-            "0100770008dd8000", // Monster Hunter Generations Ultimate
-            "0100b04011742000", // Monster Hunter Rise
             "0100853015e86000", // No Man's Sky
             "01007bb017812000", // Portal
             "0100abd01785c000", // Portal 2

src/Ryujinx.Graphics.GAL/Capabilities.cs

@@ -50,6 +50,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;
@@ -118,6 +122,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,
@@ -180,6 +188,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;

src/Ryujinx.Graphics.GAL/Face.cs

@@ -2,6 +2,7 @@ namespace Ryujinx.Graphics.GAL
 {
     public enum Face
     {
+        None = 0,
         Front = 0x404,
         Back = 0x405,
         FrontAndBack = 0x408,

src/Ryujinx.Graphics.GAL/IPipeline.cs

@@ -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(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();

src/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFaceCullingCommand.cs

@@ -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);
         }
     }
 }

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs

@@ -159,15 +159,15 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public void SetDepthTest(DepthTestDescriptor depthTest)
+        public void SetDepthTest(DepthTestDescriptor depthTest, bool signalChange = true)
         {
             _renderer.New<SetDepthTestCommand>().Set(depthTest);
             _renderer.QueueCommand();
         }
 
-        public void SetFaceCulling(bool enable, Face face)
+        public void SetFaceCulling(Face face)
         {
-            _renderer.New<SetFaceCullingCommand>().Set(enable, face);
+            _renderer.New<SetFaceCullingCommand>().Set(face);
             _renderer.QueueCommand();
         }
 
@@ -243,13 +243,13 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public void SetPrimitiveTopology(PrimitiveTopology topology)
+        public void SetPrimitiveTopology(PrimitiveTopology topology, bool signalChange = true)
         {
             _renderer.New<SetPrimitiveTopologyCommand>().Set(topology);
             _renderer.QueueCommand();
         }
 
-        public void SetProgram(IProgram program)
+        public void SetProgram(IProgram program, bool signalChange = true)
         {
             _renderer.New<SetProgramCommand>().Set(Ref(program));
             _renderer.QueueCommand();
@@ -261,7 +261,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask)
+        public void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask, bool signalChange = true)
         {
             _renderer.New<SetRenderTargetColorMasksCommand>().Set(_renderer.CopySpan(componentMask));
             _renderer.QueueCommand();
@@ -273,7 +273,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public void SetScissors(ReadOnlySpan<Rectangle<int>> scissors)
+        public void SetScissors(ReadOnlySpan<Rectangle<int>> scissors, bool signalChange = true)
         {
             _renderer.New<SetScissorsCommand>().Set(_renderer.CopySpan(scissors));
             _renderer.QueueCommand();
@@ -339,7 +339,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public void SetViewports(ReadOnlySpan<Viewport> viewports)
+        public void SetViewports(ReadOnlySpan<Viewport> viewports, bool signalChange = true)
         {
             _renderer.New<SetViewportsCommand>().Set(_renderer.CopySpan(viewports));
             _renderer.QueueCommand();

src/Ryujinx.Graphics.GAL/ProgramPipelineState.cs

@@ -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)

src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs

@@ -854,6 +854,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);
         }
 
@@ -1026,7 +1029,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);
         }
 
@@ -1196,9 +1198,16 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             var yControl = _state.State.YControl;
             var 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);
         }
@@ -1388,6 +1397,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,

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 2;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 7353;
+        private const uint CodeGenVersion = 6877;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs

@@ -23,6 +23,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>
@@ -233,10 +235,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();
@@ -306,6 +305,8 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
                         using var streams = _hostStorage.GetOutputStreams(_context);
 
                         int packagedShaders = 0;
+                        ProgramPipelineState currentPipelineState = default;
+
                         foreach (var kv in _programList)
                         {
                             if (!Active)
@@ -315,12 +316,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
                     {
@@ -344,6 +386,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>

src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs

@@ -118,7 +118,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
         private static string GetDiskCachePath()
         {
             return GraphicsConfig.EnableShaderCache && GraphicsConfig.TitleId != null
-                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId, "cache", "shader")
+                ? Path.Combine(AppDataManager.GamesDirPath, GraphicsConfig.TitleId.ToLower(), "cache", "shader")
                 : null;
         }
 

src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs

@@ -191,6 +191,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,

src/Ryujinx.Graphics.OpenGL/Pipeline.cs

@@ -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);

src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs

@@ -257,8 +257,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));
         }

src/Ryujinx.Graphics.Vulkan/EnumConversion.cs

@@ -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

src/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs

@@ -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 HardwareCapabilities(
             bool supportsIndexTypeUint8,
@@ -71,6 +74,8 @@ namespace Ryujinx.Graphics.Vulkan
             bool supportsShaderStorageImageMultisample,
             bool supportsConditionalRendering,
             bool supportsExtendedDynamicState,
+            PhysicalDeviceExtendedDynamicState2FeaturesEXT supportsExtendedDynamicState2,
+            uint maxTessellationPatchSize,
             bool supportsMultiView,
             bool supportsNullDescriptors,
             bool supportsPushDescriptors,
@@ -86,6 +91,7 @@ namespace Ryujinx.Graphics.Vulkan
             bool supportsViewportArray2,
             bool supportsHostImportedMemory,
             bool supportsDepthClipControl,
+            bool supportsWideLines,
             bool supportsAttachmentFeedbackLoop,
             bool supportsDynamicAttachmentFeedbackLoop,
             uint subgroupSize,
@@ -110,6 +116,8 @@ namespace Ryujinx.Graphics.Vulkan
             SupportsShaderStorageImageMultisample = supportsShaderStorageImageMultisample;
             SupportsConditionalRendering = supportsConditionalRendering;
             SupportsExtendedDynamicState = supportsExtendedDynamicState;
+            SupportsExtendedDynamicState2 = supportsExtendedDynamicState2;
+            MaxTessellationPatchSize = maxTessellationPatchSize;
             SupportsMultiView = supportsMultiView;
             SupportsNullDescriptors = supportsNullDescriptors;
             SupportsPushDescriptors = supportsPushDescriptors;
@@ -125,6 +133,7 @@ namespace Ryujinx.Graphics.Vulkan
             SupportsViewportArray2 = supportsViewportArray2;
             SupportsHostImportedMemory = supportsHostImportedMemory;
             SupportsDepthClipControl = supportsDepthClipControl;
+            SupportsWideLines = supportsWideLines;
             SupportsAttachmentFeedbackLoop = supportsAttachmentFeedbackLoop;
             SupportsDynamicAttachmentFeedbackLoop = supportsDynamicAttachmentFeedbackLoop;
             SubgroupSize = subgroupSize;

src/Ryujinx.Graphics.Vulkan/HelperShader.cs

@@ -429,35 +429,35 @@ 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())
             {
-                _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;
             int dstHeight = dst.Height;
 
-            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight);
-            _pipeline.SetRenderTargetColorMasks(new uint[] { 0xf });
-            _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dstWidth, dstHeight) });
+            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight, false);
+            _pipeline.SetRenderTargetColorMasks(new uint[] { 0xf }, false);
+            _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dstWidth, dstHeight) }, false);
 
             if (clearAlpha)
             {
                 _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);
 
@@ -524,10 +524,10 @@ namespace Ryujinx.Graphics.Vulkan
             int dstWidth = dst.Width;
             int dstHeight = dst.Height;
 
-            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight);
-            _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dstWidth, dstHeight) });
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
+            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight, false);
+            _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dstWidth, dstHeight) }, false);
+            _pipeline.SetViewports(viewports, false);
+            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip, false);
 
             var aspectFlags = src.Info.Format.ConvertAspectFlags();
 
@@ -589,12 +589,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));
             }
 
@@ -684,11 +684,11 @@ namespace Ryujinx.Graphics.Vulkan
                 program = _programColorClearF;
             }
 
-            _pipeline.SetProgram(program);
-            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight);
-            _pipeline.SetRenderTargetColorMasks(new[] { componentMask });
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetScissors(stackalloc Rectangle<int>[] { scissor });
+            _pipeline.SetProgram(program, false);
+            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight, false);
+            _pipeline.SetRenderTargetColorMasks(new[] { componentMask }, false);
+            _pipeline.SetViewports(viewports, false);
+            _pipeline.SetScissors(stackalloc Rectangle<int>[] { scissor }, false);
             _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
             _pipeline.Draw(4, 1, 0, 0);
             _pipeline.Finish();
@@ -731,12 +731,12 @@ namespace Ryujinx.Graphics.Vulkan
                 0f,
                 1f);
 
-            _pipeline.SetProgram(_programDepthStencilClear);
-            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight);
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetScissors(stackalloc Rectangle<int>[] { scissor });
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
-            _pipeline.SetDepthTest(new DepthTestDescriptor(true, depthMask, CompareOp.Always));
+            _pipeline.SetProgram(_programDepthStencilClear, false);
+            _pipeline.SetRenderTarget(dst, (uint)dstWidth, (uint)dstHeight, false);
+            _pipeline.SetViewports(viewports, false);
+            _pipeline.SetScissors(stackalloc Rectangle<int>[] { scissor }, false);
+            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip, false);
+            _pipeline.SetDepthTest(new DepthTestDescriptor(true, depthMask, CompareOp.Always), false);
             _pipeline.SetStencilTest(CreateStencilTestDescriptor(stencilMask != 0, stencilValue, 0xff, stencilMask));
             _pipeline.Draw(4, 1, 0, 0);
             _pipeline.Finish();
@@ -794,8 +794,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);
 
@@ -1129,16 +1129,16 @@ namespace Ryujinx.Graphics.Vulkan
                     0f,
                     1f);
 
-                _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dst.Width, dst.Height) });
-                _pipeline.SetViewports(viewports);
-                _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
+                _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dst.Width, dst.Height) }, false);
+                _pipeline.SetViewports(viewports, false);
+                _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip, false);
 
                 for (int z = 0; z < depth; z++)
                 {
                     var srcView = Create2DLayerView(src, srcLayer + z, 0);
                     var 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: true);
 
@@ -1251,9 +1251,9 @@ namespace Ryujinx.Graphics.Vulkan
                 1f);
 
             _pipeline.SetRenderTargetColorMasks(new uint[] { 0xf });
-            _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dst.Width, dst.Height) });
-            _pipeline.SetViewports(viewports);
-            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip);
+            _pipeline.SetScissors(stackalloc Rectangle<int>[] { new Rectangle<int>(0, 0, dst.Width, dst.Height) }, false);
+            _pipeline.SetViewports(viewports, false);
+            _pipeline.SetPrimitiveTopology(PrimitiveTopology.TriangleStrip, false);
 
             _pipeline.SetUniformBuffers(stackalloc[] { new BufferAssignment(0, buffer.Range) });
 
@@ -1264,7 +1264,7 @@ namespace Ryujinx.Graphics.Vulkan
                     var srcView = Create2DLayerView(src, srcLayer + z, 0);
                     var 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);
 
@@ -1281,7 +1281,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
             else
             {
-                _pipeline.SetProgram(_programColorDrawToMs);
+                _pipeline.SetProgram(_programColorDrawToMs, false);
 
                 var format = GetFormat(src.Info.BytesPerPixel);
                 var vkFormat = FormatTable.GetFormat(format);
@@ -1358,12 +1358,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));
             }
 

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -1,3 +1,5 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
 using Silk.NET.Vulkan;
@@ -74,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;
@@ -87,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;
 
@@ -94,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;
@@ -126,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()
@@ -632,19 +652,46 @@ namespace Ryujinx.Graphics.Vulkan
         {
             if (texture is TextureView srcTexture)
             {
-                var oldCullMode = _newState.CullMode;
-                var oldStencilTestEnable = _newState.StencilTestEnable;
-                var oldDepthTestEnable = _newState.DepthTestEnable;
-                var oldDepthWriteEnable = _newState.DepthWriteEnable;
-                var oldViewports = DynamicState.Viewports;
-                var oldViewportsCount = _newState.ViewportsCount;
-                var oldTopology = _topology;
+                CullModeFlags oldCullMode;
+                bool oldStencilTestEnable;
+                bool oldDepthTestEnable;
+                bool oldDepthWriteEnable;
+                PrimitiveTopology oldTopology;
+                Array16<Silk.NET.Vulkan.Viewport> oldViewports = DynamicState.Viewports;
+                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,
@@ -654,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();
             }
         }
 
@@ -792,48 +847,102 @@ 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)
@@ -872,28 +981,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?)
         }
@@ -910,12 +1047,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;
 
@@ -923,10 +1069,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)
         {
             var internalProgram = (ShaderCollection)program;
             var stages = internalProgram.GetInfos();
@@ -942,7 +1096,10 @@ namespace Ryujinx.Graphics.Vulkan
 
             stages.CopyTo(_newState.Stages.AsSpan()[..stages.Length]);
 
-            SignalStateChange();
+            if (signalChange)
+            {
+                SignalStateChange();
+            }
 
             if (internalProgram.IsCompute)
             {
@@ -968,18 +1125,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;
@@ -1019,7 +1184,10 @@ namespace Ryujinx.Graphics.Vulkan
             }
             else
             {
-                SignalStateChange();
+                if (signalChange)
+                {
+                    SignalStateChange();
+                }
 
                 if (writtenAttachments != _writtenAttachmentCount)
                 {
@@ -1043,7 +1211,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);
@@ -1052,6 +1220,8 @@ namespace Ryujinx.Graphics.Vulkan
                 ClearScissor = regions[0];
             }
 
+            DynamicState.ScissorsCount = count;
+
             for (int i = 0; i < count; i++)
             {
                 var region = regions[i];
@@ -1061,34 +1231,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)
@@ -1207,12 +1399,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 = default;
+            bool vertexBindingDescriptionChanged = false;
+            bool vertexDescriptionCountChanged = false;
 
             for (int i = 0; i < count; i++)
             {
@@ -1231,13 +1435,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;
 
@@ -1253,7 +1476,7 @@ namespace Ryujinx.Graphics.Vulkan
                             }
                         }
 
-                        ref var buffer = ref _vertexBuffers[binding];
+                        ref var buffer = ref _vertexBuffers[_vertexBufferBindings[i]];
                         int oldScalarAlign = buffer.AttributeScalarAlignment;
 
                         if (Gd.Capabilities.VertexBufferAlignment < 2 &&
@@ -1270,7 +1493,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
@@ -1286,7 +1509,7 @@ namespace Ryujinx.Graphics.Vulkan
                                 vbSize,
                                 vertexBuffer.Stride);
 
-                            _vertexBuffersDirty |= 1UL << binding;
+                            _vertexBuffersDirty |= 1UL << _vertexBufferBindings[i];
                         }
 
                         buffer.AttributeScalarAlignment = oldScalarAlign;
@@ -1296,11 +1519,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);
@@ -1325,8 +1556,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)
@@ -1375,7 +1613,7 @@ namespace Ryujinx.Graphics.Vulkan
             _vertexBuffersDirty = ulong.MaxValue >> (64 - _vertexBuffers.Length);
 
             _descriptorSetUpdater.SignalCommandBufferChange();
-            DynamicState.ForceAllDirty();
+            DynamicState.ForceAllDirty(Gd);
             _currentPipelineHandle = 0;
         }
 
@@ -1529,9 +1767,10 @@ namespace Ryujinx.Graphics.Vulkan
             {
                 if (Gd.Capabilities.SupportsDynamicAttachmentFeedbackLoop)
                 {
+                    _newState.FeedbackLoopDynamicState = true;
                     DynamicState.SetFeedbackLoop(aspects);
                 }
-                else
+                else if (Gd.Capabilities.SupportsAttachmentFeedbackLoop)
                 {
                     _newState.FeedbackLoopAspects = aspects;
                 }
@@ -1591,7 +1830,14 @@ 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()

src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs

@@ -4,6 +4,7 @@ using Silk.NET.Vulkan;
 using System;
 using Format = Silk.NET.Vulkan.Format;
 using PolygonMode = Silk.NET.Vulkan.PolygonMode;
+using PrimitiveTopology = Ryujinx.Graphics.GAL.PrimitiveTopology;
 
 namespace Ryujinx.Graphics.Vulkan
 {
@@ -160,64 +161,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);
 
@@ -241,7 +262,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);
 
             for (int i = 0; i < vbCount; i++)
             {
@@ -261,7 +282,7 @@ namespace Ryujinx.Graphics.Vulkan
                     // TODO: Support divisor > 1
                     pipeline.Internal.VertexBindingDescriptions[descriptorIndex++] = new VertexInputBindingDescription(
                         (uint)i + 1,
-                        (uint)alignedStride,
+                        extendedDynamicState && (!gd.IsMoltenVk || gd.SupportsMTL31) ? null : (uint)alignedStride,
                         inputRate);
                 }
             }

src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs

@@ -1,6 +1,8 @@
 using Ryujinx.Common.Memory;
 using Silk.NET.Vulkan;
 using Silk.NET.Vulkan.Extensions.EXT;
+using System;
+using System.Numerics;
 
 namespace Ryujinx.Graphics.Vulkan
 {
@@ -9,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;
@@ -20,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;
@@ -27,6 +47,20 @@ 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
         {
             None = 0,
@@ -36,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,
+            Extended = CullMode | FrontFace | DepthTestBool | DepthTestCompareOp | StencilTestEnableAndStencilOp | PrimitiveTopology,
+            Extended2 = RasterDiscard | PrimitiveRestart | DepthBiasEnable,
         }
 
         private DirtyFlags _dirty;
@@ -47,7 +95,6 @@ namespace Ryujinx.Graphics.Vulkan
             _blendConstants[1] = g;
             _blendConstants[2] = b;
             _blendConstants[3] = a;
-
             _dirty |= DirtyFlags.Blend;
         }
 
@@ -60,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,
@@ -81,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;
@@ -110,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;
@@ -162,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);
@@ -180,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)

src/Ryujinx.Graphics.Vulkan/PipelineHelperShader.cs

@@ -9,11 +9,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)

src/Ryujinx.Graphics.Vulkan/PipelineUid.cs

@@ -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;
 
             for (int i = 0; i < (int)VertexAttributeDescriptionsCount; i++)
             {

src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs

@@ -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;

src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs

@@ -73,7 +73,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;
@@ -81,8 +84,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)
                 {

src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs

@@ -51,7 +51,7 @@ namespace Ryujinx.Graphics.Vulkan
         {
             if (_count != 0)
             {
-                if (_gd.Capabilities.SupportsExtendedDynamicState)
+                if (_gd.Capabilities.SupportsExtendedDynamicState && (_gd.SupportsMTL31 || !_gd.IsMoltenVk))
                 {
                     _gd.ExtendedDynamicStateApi.CmdBindVertexBuffers2(
                         cbs.CommandBuffer,

src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

@@ -23,6 +23,7 @@ namespace Ryujinx.Graphics.Vulkan
         private static readonly string[] _desirableExtensions = {
             ExtConditionalRendering.ExtensionName,
             ExtExtendedDynamicState.ExtensionName,
+            ExtExtendedDynamicState2.ExtensionName,
             ExtTransformFeedback.ExtensionName,
             KhrDrawIndirectCount.ExtensionName,
             KhrPushDescriptor.ExtensionName,
@@ -314,6 +315,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,
@@ -416,6 +428,7 @@ namespace Ryujinx.Graphics.Vulkan
                 TessellationShader = supportedFeatures.TessellationShader,
                 VertexPipelineStoresAndAtomics = supportedFeatures.VertexPipelineStoresAndAtomics,
                 RobustBufferAccess = useRobustBufferAccess,
+                WideLines = supportedFeatures.WideLines,
                 SampleRateShading = supportedFeatures.SampleRateShading,
             };
 
@@ -473,6 +486,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;
+            }
+
             var featuresVk11 = new PhysicalDeviceVulkan11Features
             {
                 SType = StructureType.PhysicalDeviceVulkan11Features,

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -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; }
@@ -94,6 +95,7 @@ namespace Ryujinx.Graphics.Vulkan
         internal bool IsIntelArc { get; private set; }
         internal bool IsQualcommProprietary { get; private set; }
         internal bool IsMoltenVk { get; private set; }
+        internal bool SupportsMTL31 { get; private set; }
         internal bool IsTBDR { get; private set; }
         internal bool IsSharedMemory { get; private set; }
 
@@ -119,6 +121,8 @@ namespace Ryujinx.Graphics.Vulkan
             // Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
             if (IsMoltenVk = OperatingSystem.IsMacOS())
                 MVKInitialization.Initialize();
+
+            SupportsMTL31 = OperatingSystem.IsMacOSVersionAtLeast(14);
         }
 
         public static VulkanRenderer Create(
@@ -141,6 +145,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;
@@ -235,6 +244,11 @@ namespace Ryujinx.Graphics.Vulkan
                 SType = StructureType.PhysicalDevicePrimitiveTopologyListRestartFeaturesExt,
             };
 
+            PhysicalDeviceExtendedDynamicState2FeaturesEXT featuresExtendedDynamicState2 = new()
+            {
+                SType = StructureType.PhysicalDeviceExtendedDynamicState2FeaturesExt,
+            };
+
             PhysicalDeviceRobustness2FeaturesEXT featuresRobustness2 = new()
             {
                 SType = StructureType.PhysicalDeviceRobustness2FeaturesExt,
@@ -275,6 +289,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;
@@ -408,6 +428,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,
@@ -424,6 +448,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 && !IsMoltenVk,
@@ -439,6 +465,7 @@ namespace Ryujinx.Graphics.Vulkan
                 _physicalDevice.IsDeviceExtensionPresent("VK_NV_viewport_array2"),
                 _physicalDevice.IsDeviceExtensionPresent(ExtExternalMemoryHost.ExtensionName),
                 supportsDepthClipControl && featuresDepthClipControl.DepthClipControl,
+                _physicalDevice.PhysicalDeviceFeatures.WideLines,
                 supportsAttachmentFeedbackLoop && featuresAttachmentFeedbackLoop.AttachmentFeedbackLoopLayout,
                 supportsDynamicAttachmentFeedbackLoop && featuresDynamicAttachmentFeedbackLoop.AttachmentFeedbackLoopDynamicState,
                 propertiesSubgroup.SubgroupSize,
@@ -774,6 +801,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,

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -710,9 +710,8 @@ namespace Ryujinx.HLE.FileSystem
                         {
                             updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
                         }
-                        else
+                        else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
                         {
-                            updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                             updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName));
                         }
                     }
@@ -898,9 +897,8 @@ namespace Ryujinx.HLE.FileSystem
                     {
                         updateNcasItem.Add((nca.Header.ContentType, entry.FullPath));
                     }
-                    else
+                    else if (updateNcas.TryAdd(nca.Header.TitleId, new List<(NcaContentType, string)>()))
                     {
-                        updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
                         updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullPath));
                     }
 

src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs

@@ -244,6 +244,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
             return ResultCode.Success;
         }
 
+        [CommandCmif(68)]
+        // GetSerialNumber() -> buffer<nn::settings::system::SerialNumber, 0x16>
+        public ResultCode GetSerialNumber(ServiceCtx context)
+        {
+            context.ResponseData.Write(Encoding.ASCII.GetBytes("RYU00000000000"));
+
+            return ResultCode.Success;
+        }
+
         [CommandCmif(77)]
         // GetDeviceNickName() -> buffer<nn::settings::system::DeviceNickName, 0x16>
         public ResultCode GetDeviceNickName(ServiceCtx context)

src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs

@@ -51,6 +51,9 @@ namespace Ryujinx.HLE.HOS.Services.Spl
 
             context.ResponseData.Write(configValue);
 
+            if (result == SmcResult.Success)
+                return ResultCode.Success;
+
             return (ResultCode)((int)result << 9) | ResultCode.ModuleId;
         }
 

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -1,6 +1,7 @@
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Logging;
+using SDL2;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -118,6 +119,11 @@ namespace Ryujinx.Input.SDL2
                 result |= GamepadFeaturesFlag.Rumble;
             }
 
+            if (SDL_GameControllerHasLED(_gamepadHandle) == SDL_bool.SDL_TRUE)
+            {
+                result |= GamepadFeaturesFlag.Led;
+            }
+
             return result;
         }
 

src/Ryujinx.Input/GamepadFeaturesFlag.cs

@@ -24,5 +24,10 @@ namespace Ryujinx.Input
         /// <remarks>Also named sixaxis</remarks>
         /// </summary>
         Motion,
+        
+        /// <summary>
+        ///     The LED on the back of modern PlayStation controllers (DualSense &amp; DualShock 4).
+        /// </summary>
+        Led,
     }
 }

src/Ryujinx/AppHost.cs

@@ -674,7 +674,7 @@ namespace Ryujinx.Ava
 
         public async Task<bool> LoadGuestApplication(BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
-            InitializeSwitchInstance();
+            InitEmulatedSwitch();
             MainWindow.UpdateGraphicsConfig();
 
             SystemVersion firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
@@ -757,6 +757,8 @@ namespace Ryujinx.Ava
                 {
                     romFsFiles = Directory.GetFiles(ApplicationPath, "*.romfs");
                 }
+                
+                Logger.Notice.Print(LogClass.Application, $"Loading unpacked content archive from '{ApplicationPath}'.");
 
                 if (romFsFiles.Length > 0)
                 {
@@ -783,6 +785,8 @@ namespace Ryujinx.Ava
             }
             else if (File.Exists(ApplicationPath))
             {
+                Logger.Notice.Print(LogClass.Application, $"Loading content archive from '{ApplicationPath}'.");
+                
                 switch (Path.GetExtension(ApplicationPath).ToLowerInvariant())
                 {
                     case ".xci":
@@ -885,7 +889,7 @@ namespace Ryujinx.Ava
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 
-        private void InitializeSwitchInstance()
+        private void InitEmulatedSwitch()
         {
             // Initialize KeySet.
             VirtualFileSystem.ReloadKeySet();
@@ -1040,7 +1044,7 @@ namespace Ryujinx.Ava
                     _viewModel.WindowState = WindowState.FullScreen;
                 }
 
-                if (_viewModel.WindowState is WindowState.FullScreen)
+                if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
                 {
                     _viewModel.ShowMenuAndStatusBar = false;
                 }

src/Ryujinx/Assets/Styles/CheckboxMenuItemStyle.axaml

@@ -0,0 +1,13 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style Selector="MenuItem.withCheckbox Viewbox#PART_IconPresenter">
+        <Setter Property="MaxHeight" Value="36" />
+        <Setter Property="MinHeight" Value="36" />
+        <Setter Property="MaxWidth" Value="36" />
+        <Setter Property="MinWidth" Value="36" />
+    </Style>
+    <Style Selector="MenuItem.withCheckbox ContentPresenter#PART_HeaderPresenter">
+        <Setter Property="Padding" Value="-10,0,0,0" />
+    </Style>
+</Styles>
+

src/Ryujinx/Assets/locales.json

@@ -572,6 +572,31 @@
         "zh_TW": "使用全螢幕模式啟動遊戲"
       }
     },
+    {
+      "ID": "MenuBarOptionsStartGamesWithoutUI",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Start Games with UI Hidden",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "MenuBarOptionsStopEmulation",
       "Translations": {
@@ -748,32 +773,7 @@
       }
     },
     {
-      "ID": "MenuBarTools",
-      "Translations": {
-        "ar_SA": "_الأدوات",
-        "de_DE": "",
-        "el_GR": "_Εργαλεία",
-        "en_US": "_Tools",
-        "es_ES": "_Herramientas",
-        "fr_FR": "_Outils",
-        "he_IL": "_כלים",
-        "it_IT": "_Strumenti",
-        "ja_JP": "ツール(_T)",
-        "ko_KR": "도구(_T)",
-        "no_NO": "_Verktøy",
-        "pl_PL": "_Narzędzia",
-        "pt_BR": "_Ferramentas",
-        "ru_RU": "_Инструменты",
-        "sv_SE": "V_erktyg",
-        "th_TH": "_เครื่องมือ",
-        "tr_TR": "_Araçlar",
-        "uk_UA": "_Інструменти",
-        "zh_CN": "工具(_T)",
-        "zh_TW": "工具(_T)"
-      }
-    },
-    {
-      "ID": "MenuBarToolsInstallFirmware",
+      "ID": "MenuBarActionsInstallFirmware",
       "Translations": {
         "ar_SA": "تثبيت البرنامج الثابت",
         "de_DE": "Firmware installieren",
@@ -798,7 +798,7 @@
       }
     },
     {
-      "ID": "MenuBarFileToolsInstallFirmwareFromFile",
+      "ID": "MenuBarActionsInstallFirmwareFromFile",
       "Translations": {
         "ar_SA": "تثبيت برنامج ثابت من XCI أو ZIP",
         "de_DE": "Firmware von einer XCI- oder einer ZIP-Datei installieren",
@@ -823,7 +823,7 @@
       }
     },
     {
-      "ID": "MenuBarFileToolsInstallFirmwareFromDirectory",
+      "ID": "MenuBarActionsInstallFirmwareFromDirectory",
       "Translations": {
         "ar_SA": "تثبيت برنامج ثابت من مجلد",
         "de_DE": "Firmware aus einem Verzeichnis installieren",
@@ -848,7 +848,7 @@
       }
     },
     {
-      "ID": "MenuBarToolsInstallKeys",
+      "ID": "MenuBarActionsInstallKeys",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
@@ -873,7 +873,7 @@
       }
     },
     {
-      "ID": "MenuBarFileToolsInstallKeysFromFile",
+      "ID": "MenuBarFileActionsInstallKeysFromFile",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
@@ -898,7 +898,7 @@
       }
     },
     {
-      "ID": "MenuBarFileToolsInstallKeysFromFolder",
+      "ID": "MenuBarFileActionsInstallKeysFromFolder",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
@@ -923,7 +923,7 @@
       }
     },
     {
-      "ID": "MenuBarToolsManageFileTypes",
+      "ID": "MenuBarActionsManageFileTypes",
       "Translations": {
         "ar_SA": "إدارة أنواع الملفات",
         "de_DE": "Dateitypen verwalten",
@@ -948,7 +948,7 @@
       }
     },
     {
-      "ID": "MenuBarToolsInstallFileTypes",
+      "ID": "MenuBarActionsInstallFileTypes",
       "Translations": {
         "ar_SA": "تثبيت أنواع الملفات",
         "de_DE": "Dateitypen installieren",
@@ -973,7 +973,7 @@
       }
     },
     {
-      "ID": "MenuBarToolsUninstallFileTypes",
+      "ID": "MenuBarActionsUninstallFileTypes",
       "Translations": {
         "ar_SA": "إزالة أنواع الملفات",
         "de_DE": "Dateitypen deinstallieren",
@@ -998,7 +998,7 @@
       }
     },
     {
-      "ID": "MenuBarToolsXCITrimmer",
+      "ID": "MenuBarActionsXCITrimmer",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
@@ -2335,7 +2335,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Pakk ut RomFS filene fra valgt DLC fil",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
@@ -22960,7 +22960,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "",
+        "no_NO": "Velg en DLC og hente ut",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",

src/Ryujinx/Common/ApplicationHelper.cs

@@ -1,6 +1,6 @@
-using Avalonia.Controls.Notifications;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using Gommon;
 using LibHac;
 using LibHac.Account;
 using LibHac.Common;
@@ -15,6 +15,7 @@ using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
@@ -418,35 +419,27 @@ namespace Ryujinx.Ava.Common
 
         public static async Task ExtractAoc(IStorageProvider storageProvider, string updateFilePath, string updateName)
         {
-            var result = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+            Optional<IStorageFolder> result = await storageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions
             {
-                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
-                AllowMultiple = false,
+                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle]
             });
 
-            if (result.Count == 0)
-            {
-                return;
-            }
-
-            ExtractAoc(result[0].Path.LocalPath, updateFilePath, updateName);
+            if (!result.HasValue) return;
+            
+            ExtractAoc(result.Value.Path.LocalPath, updateFilePath, updateName);
         }
 
 
         public static async Task ExtractSection(IStorageProvider storageProvider, NcaSectionType ncaSectionType, string titleFilePath, string titleName, int programIndex = 0)
         {
-            var result = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+            Optional<IStorageFolder> result = await storageProvider.OpenSingleFolderPickerAsync(new FolderPickerOpenOptions
             {
-                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
-                AllowMultiple = false,
+                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle]
             });
 
-            if (result.Count == 0)
-            {
-                return;
-            }
+            if (!result.HasValue) return;
 
-            ExtractSection(result[0].Path.LocalPath, ncaSectionType, titleFilePath, titleName, programIndex);
+            ExtractSection(result.Value.Path.LocalPath, ncaSectionType, titleFilePath, titleName, programIndex);
         }
 
         public static (Result? result, bool canceled) CopyDirectory(FileSystemClient fs, string sourcePath, string destPath, CancellationToken token)

src/Ryujinx/Program.cs

@@ -230,13 +230,16 @@ namespace Ryujinx.Ava
         internal static void PrintSystemInfo()
         {
             Logger.Notice.Print(LogClass.Application, $"{RyujinxApp.FullAppName} Version: {Version}");
+            Logger.Notice.Print(LogClass.Application, $".NET Runtime: {RuntimeInformation.FrameworkDescription}");
             SystemInfo.Gather().Print();
 
-            var enabledLogLevels = Logger.GetEnabledLevels().ToArray();
-
-            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(enabledLogLevels.Length is 0
-                    ? "<None>"
-                    : enabledLogLevels.JoinToString(", "))}");
+            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {
+                Logger.GetEnabledLevels()
+                    .FormatCollection(
+                        x => x.ToString(), 
+                        separator: ", ", 
+                        emptyCollectionFallback: "<None>")
+            }");
 
             Logger.Notice.Print(LogClass.Application,
                 AppDataManager.Mode == AppDataManager.LaunchMode.Custom

src/Ryujinx/Ryujinx.csproj

@@ -123,12 +123,13 @@
       <Generator>MSBuild:Compile</Generator>
     </AvaloniaResource>
     <AvaloniaResource Include="Assets\Styles\Styles.xaml" />
+    <AvaloniaResource Include="Assets\Styles\CheckboxMenuItemStyle.axaml" />
   </ItemGroup>
 
   <ItemGroup>
     <None Remove="Assets\locales.json" />
-    <None Remove="Assets\Styles\Styles.xaml" />
     <None Remove="Assets\Styles\Themes.xaml" />
+    <None Remove="Assets\Styles\CheckboxMenuItemStyle.xaml" />
     <None Remove="Assets\Icons\Controller_JoyConLeft.svg" />
     <None Remove="Assets\Icons\Controller_JoyConPair.svg" />
     <None Remove="Assets\Icons\Controller_JoyConRight.svg" />
@@ -150,6 +151,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Assets\locales.json" />
     <EmbeddedResource Include="Assets\Styles\Styles.xaml" />
+    <EmbeddedResource Include="Assets\Styles\CheckboxMenuItemStyle.axaml" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConLeft.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConPair.svg" />
     <EmbeddedResource Include="Assets\Icons\Controller_JoyConRight.svg" />

src/Ryujinx/RyujinxApp.axaml

@@ -16,5 +16,6 @@
     <Application.Styles>
         <sty:FluentAvaloniaTheme PreferUserAccentColor="True" PreferSystemTheme="False" />
         <StyleInclude Source="/Assets/Styles/Styles.xaml" />
+        <StyleInclude Source="/Assets/Styles/CheckboxMenuItemStyle.axaml"/>
     </Application.Styles>
 </Application>

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

@@ -251,7 +251,7 @@ namespace Ryujinx.Ava.UI.Controls
         {
             if (sender is MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
             {
-                string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString, "cache", "shader");
+                string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, viewModel.SelectedApplication.IdString.ToLower(), "cache", "shader");
 
                 if (!Directory.Exists(shaderCacheDir))
                 {

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

@@ -3,14 +3,11 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
-using Ryujinx.Ava.Utilities.Compat;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Controls
@@ -22,9 +19,9 @@ namespace Ryujinx.Ava.UI.Controls
             InitializeComponent();
         }
 
-        #nullable enable
+#nullable enable
         public static async Task<DownloadableContentModel?> Show(ulong selectedTitleId, ApplicationLibrary appLibrary)
-        #nullable disable
+#nullable disable
         {
             DlcSelectViewModel viewModel = new(selectedTitleId, appLibrary);
 
@@ -52,4 +49,3 @@ namespace Ryujinx.Ava.UI.Controls
         }
     }
 }
-

src/Ryujinx/UI/Helpers/Commands.cs

@@ -12,9 +12,9 @@ namespace Ryujinx.Ava.UI.Helpers
         public static RelayCommand CreateConditional(Action action, Func<bool> canExecute)
             => new(action, canExecute);
         
-        public static RelayCommand<T> CreateWithArg<T>(Action<T?> action)
+        public static RelayCommand<T> Create<T>(Action<T?> action)
             => new(action);
-        public static RelayCommand<T> CreateConditionalWithArg<T>(Action<T?> action, Predicate<T?> canExecute)
+        public static RelayCommand<T> CreateConditional<T>(Action<T?> action, Predicate<T?> canExecute)
             => new(action, canExecute);
 
         public static AsyncRelayCommand Create(Func<Task> action)
@@ -24,11 +24,11 @@ namespace Ryujinx.Ava.UI.Helpers
         public static AsyncRelayCommand CreateSilentFail(Func<Task> action)
             => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
         
-        public static AsyncRelayCommand<T> CreateWithArg<T>(Func<T?, Task> action)
+        public static AsyncRelayCommand<T> Create<T>(Func<T?, Task> action)
             => new(action, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand<T> CreateConcurrentWithArg<T>(Func<T?, Task> action)
+        public static AsyncRelayCommand<T> CreateConcurrent<T>(Func<T?, Task> action)
             => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand<T> CreateSilentFailWithArg<T>(Func<T?, Task> action)
+        public static AsyncRelayCommand<T> CreateSilentFail<T>(Func<T?, Task> action)
             => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
 
         public static AsyncRelayCommand CreateConditional(Func<Task> action, Func<bool> canExecute)
@@ -38,11 +38,11 @@ namespace Ryujinx.Ava.UI.Helpers
         public static AsyncRelayCommand CreateSilentFailConditional(Func<Task> action, Func<bool> canExecute)
             => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
         
-        public static AsyncRelayCommand<T> CreateConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+        public static AsyncRelayCommand<T> CreateConditional<T>(Func<T?, Task> action, Predicate<T?> canExecute)
             => new(action, canExecute, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand<T> CreateConcurrentConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+        public static AsyncRelayCommand<T> CreateConcurrentConditional<T>(Func<T?, Task> action, Predicate<T?> canExecute)
             => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand<T> CreateSilentFailConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+        public static AsyncRelayCommand<T> CreateSilentFailConditional<T>(Func<T?, Task> action, Predicate<T?> canExecute)
             => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
     }
 }

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

@@ -1,3 +1,4 @@
+using Avalonia.Media;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
@@ -387,6 +388,30 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
+        private bool _enableLedChanging;
+
+        public bool EnableLedChanging
+        {
+            get => _enableLedChanging;
+            set
+            {
+                _enableLedChanging = value;
+                OnPropertyChanged();
+            }
+        }
+        
+        private Color _ledColor;
+
+        public Color LedColor
+        {
+            get => _ledColor;
+            set
+            {
+                _ledColor = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _enableMotion;
         public bool EnableMotion
         {
@@ -483,12 +508,23 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = controllerInput.Rumble.WeakRumble;
                     StrongRumble = controllerInput.Rumble.StrongRumble;
                 }
+                
+                if (controllerInput.Led != null)
+                {
+                    EnableLedChanging = controllerInput.Led.EnableLed;
+                    uint rawColor = controllerInput.Led.LedColor;
+                    byte alpha = (byte)(rawColor >> 24);
+                    byte red = (byte)(rawColor >> 16);
+                    byte green = (byte)(rawColor >> 8);
+                    byte blue = (byte)(rawColor % 256);
+                    LedColor = new Color(alpha, red, green, blue);
+                }
             }
         }
 
         public InputConfig GetConfig()
         {
-            var config = new StandardControllerInputConfig
+            StandardControllerInputConfig config = new()
             {
                 Id = Id,
                 Backend = InputBackendType.GamepadSDL2,
@@ -540,6 +576,11 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = WeakRumble,
                     StrongRumble = StrongRumble,
                 },
+                Led = new LedConfigController
+                {
+                    EnableLed = EnableLedChanging,
+                    LedColor = LedColor.ToUInt32()
+                },
                 Version = InputConfig.CurrentVersion,
                 DeadzoneLeft = DeadzoneLeft,
                 DeadzoneRight = DeadzoneRight,

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

@@ -37,7 +37,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         [ObservableProperty] private SvgImage _image;
 
-        public readonly InputViewModel ParentModel;
+        public InputViewModel ParentModel { get; }
 
         public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
         {

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

@@ -68,6 +68,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsKeyboard => !IsController;
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
+        
+        public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
 
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -488,6 +488,19 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public bool StartGamesWithoutUI
+        {
+            get => ConfigurationState.Instance.UI.StartNoUI;
+            set
+            {
+                ConfigurationState.Instance.UI.StartNoUI.Value = value;
+
+                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
+                OnPropertyChanged();
+            }
+        }
+
         public bool ShowConsole
         {
             get => ConfigurationState.Instance.UI.ShowConsole;
@@ -624,6 +637,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     ApplicationSort.FileSize => LocaleManager.Instance[LocaleKeys.GameListHeaderFileSize],
                     ApplicationSort.Path => LocaleManager.Instance[LocaleKeys.GameListHeaderPath],
                     ApplicationSort.Favorite => LocaleManager.Instance[LocaleKeys.CommonFavorite],
+                    ApplicationSort.TitleId => LocaleManager.Instance[LocaleKeys.DlcManagerTableHeadingTitleIdLabel],
                     _ => string.Empty,
                 };
             }
@@ -694,6 +708,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public IHostUIHandler UiHandler { get; internal set; }
         public bool IsSortedByFavorite => SortMode == ApplicationSort.Favorite;
         public bool IsSortedByTitle => SortMode == ApplicationSort.Title;
+        public bool IsSortedByTitleId => SortMode == ApplicationSort.TitleId;
         public bool IsSortedByDeveloper => SortMode == ApplicationSort.Developer;
         public bool IsSortedByLastPlayed => SortMode == ApplicationSort.LastPlayed;
         public bool IsSortedByTimePlayed => SortMode == ApplicationSort.TotalTimePlayed;
@@ -726,6 +741,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 ApplicationSort.FileSize        => CreateComparer(IsAscending, app => app.FileSize),
                 ApplicationSort.Path            => CreateComparer(IsAscending, app => app.Path),
                 ApplicationSort.Favorite        => CreateComparer(IsAscending, app => new AppListFavoriteComparable(app)),
+                ApplicationSort.TitleId         => CreateComparer(IsAscending, app => app.Id),
                 _ => null,
 #pragma warning restore IDE0055
             };
@@ -1195,6 +1211,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             StartGamesInFullscreen = !StartGamesInFullscreen;
         }
 
+        public void ToggleStartGamesWithoutUI()
+        {
+            StartGamesWithoutUI = !StartGamesWithoutUI;
+        }
+
         public void ToggleShowConsole()
         {
             ShowConsole = !ShowConsole;
@@ -1641,10 +1662,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task OpenAmiiboWindow()
         {
-            if (!IsAmiiboRequested)
-                return;
-
-            if (AppHost.Device.System.SearchingForAmiibo(out int deviceId))
+            if (AppHost.Device.System.SearchingForAmiibo(out int deviceId) && IsGameRunning)
             {
                 string titleId = AppHost.Device.Processes.ActiveApplication.ProgramIdText.ToUpper();
                 AmiiboWindow window = new(ShowAll, LastScannedAmiiboId, titleId);
@@ -1662,10 +1680,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
         public async Task OpenBinFile()
         {
-            if (!IsAmiiboRequested)
-                return;
-
-            if (AppHost.Device.System.SearchingForAmiibo(out int deviceId))
+            if (AppHost.Device.System.SearchingForAmiibo(out _) && IsGameRunning)
             {
                 var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
                 {

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

@@ -4,6 +4,7 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
@@ -486,6 +487,37 @@
                             </Button>
                         </Grid>
                     </Border>
+                    <Border
+                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="5"
+                        HorizontalAlignment="Stretch"
+                        Margin="0,-1,0,0">
+                        <Grid IsVisible="{Binding ParentModel.HasLed}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <CheckBox
+                                Margin="10"
+                                MinWidth="0"
+                                Grid.Column="0"
+                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
+                                <TextBlock Text="Custom LED color" />
+                            </CheckBox>
+                            <ui:ColorPickerButton 
+                                Grid.Column="1"
+                                Margin="10"
+                                IsMoreButtonVisible="False"
+                                UseColorPalette="False"
+                                UseColorTriangle="False"
+                                UseColorWheel="False"
+                                ShowAcceptDismissButtons="False"
+                                IsAlphaEnabled="False"
+                                Color="{Binding Config.LedColor, Mode=TwoWay}">
+                            </ui:ColorPickerButton>
+                        </Grid>
+                    </Border>
                 </StackPanel>
             </StackPanel>
             <!-- Right Controls -->

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

@@ -4,14 +4,11 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using DiscordRPC;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Common.Configuration.Hid.Controller;
-using Ryujinx.Common.Logging;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System;
 using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
 
 namespace Ryujinx.Ava.UI.Views.Input

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

@@ -81,25 +81,16 @@
                 <MenuItem
                     Command="{Binding ToggleFullscreen}"
                     Header="{ext:Locale MenuBarOptionsToggleFullscreen}"
+                    Classes="withCheckbox"
                     Padding="0"
                     Icon="{ext:Icon fa-solid fa-expand}"
                     InputGesture="F11">
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
                 </MenuItem>
                 <MenuItem
                     Padding="0"
                     Command="{Binding ToggleStartGamesInFullscreen}"
-                    Header="{ext:Locale MenuBarOptionsStartGamesInFullscreen}">
+                    Header="{ext:Locale MenuBarOptionsStartGamesInFullscreen}"
+                    Classes="withCheckbox">
                     <MenuItem.Icon>
                         <CheckBox
                             MinWidth="{DynamicResource CheckBoxSize}"
@@ -107,23 +98,26 @@
                             IsChecked="{Binding StartGamesInFullscreen, Mode=TwoWay}"
                             Padding="0" />
                     </MenuItem.Icon>
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
+                </MenuItem>
+                <MenuItem
+                    Padding="0"
+                    Command="{Binding ToggleStartGamesWithoutUI}"
+                    Header="{ext:Locale MenuBarOptionsStartGamesWithoutUI}"
+                    Classes="withCheckbox">
+                    <MenuItem.Icon>
+                        <CheckBox
+                            MinWidth="{DynamicResource CheckBoxSize}"
+                            MinHeight="{DynamicResource CheckBoxSize}"
+                            IsChecked="{Binding StartGamesWithoutUI, Mode=TwoWay}"
+                            Padding="0" />
+                    </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem
                     Padding="0"
                     IsVisible="{Binding ShowConsoleVisible}"
                     Command="{Binding ToggleShowConsole}"
-                    Header="{ext:Locale MenuBarOptionsShowConsole}">
+                    Header="{ext:Locale MenuBarOptionsShowConsole}"
+                    Classes="withCheckbox">
                     <MenuItem.Icon>
                         <CheckBox
                             MinWidth="{DynamicResource CheckBoxSize}"
@@ -131,35 +125,14 @@
                             IsChecked="{Binding ShowConsole, Mode=TwoWay}"
                             Padding="0" />
                     </MenuItem.Icon>
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
                 </MenuItem>
                 <Separator/>
                 <MenuItem
                     Name="ChangeLanguageMenuItem" 
                     Padding="0"
                     Header="{ext:Locale MenuBarOptionsChangeLanguage}"
-                    Icon="{ext:Icon fa-solid fa-language}">
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
+                    Icon="{ext:Icon fa-solid fa-language}"
+                    Classes="withCheckbox">
                 </MenuItem>
                 <MenuItem 
                     Name="ToggleFileTypesMenuItem" 
@@ -171,18 +144,8 @@
                     Padding="0"
                     Header="{ext:Locale MenuBarOptionsSettings}"
                     Icon="{ext:Icon fa-solid fa-gear}"
-                    ToolTip.Tip="{ext:Locale OpenSettingsTooltip}">
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
+                    ToolTip.Tip="{ext:Locale OpenSettingsTooltip}"
+                    Classes="withCheckbox">
                 </MenuItem>
                 <MenuItem
                     Command="{Binding ManageProfiles}"
@@ -190,25 +153,15 @@
                     Header="{ext:Locale MenuBarOptionsManageUserProfiles}"
                     Icon="{ext:Icon mdi-account}"
                     IsEnabled="{Binding EnableNonGameRunningControls}"
-                    ToolTip.Tip="{ext:Locale OpenProfileManagerTooltip}">
-                    <MenuItem.Styles>
-                        <Style Selector="Viewbox#PART_IconPresenter">
-                            <Setter Property="MaxHeight" Value="36" />
-                            <Setter Property="MinHeight" Value="36" />
-                            <Setter Property="MaxWidth" Value="36" />
-                            <Setter Property="MinWidth" Value="36" />
-                        </Style>
-                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
-                            <Setter Property="Padding" Value="-10,0,0,0" />
-                        </Style>
-                    </MenuItem.Styles>
+                    ToolTip.Tip="{ext:Locale OpenProfileManagerTooltip}"
+                    Classes="withCheckbox">
                 </MenuItem>
             </MenuItem>
             <MenuItem
                 Name="ActionsMenuItem"
                 VerticalAlignment="Center"
                 Header="{ext:Locale MenuBarActions}"
-                IsEnabled="{Binding IsGameRunning}">
+                IsVisible="{Binding !EnableNonGameRunningControls}">
                 <MenuItem
                     Name="PauseEmulationMenuItem"
                     Header="{ext:Locale MenuBarOptionsPauseEmulation}"
@@ -265,21 +218,21 @@
                     Icon="{ext:Icon fa-solid fa-code}"
                     IsEnabled="{Binding IsGameRunning}" />
             </MenuItem>
-            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarTools}">
-                <MenuItem Header="{ext:Locale MenuBarToolsInstallKeys}" Icon="{ext:Icon fa-solid fa-key}" IsEnabled="{Binding EnableNonGameRunningControls}">
-                    <MenuItem Command="{Binding InstallKeysFromFile}" Header="{ext:Locale MenuBarFileToolsInstallKeysFromFile}" Icon="{ext:Icon mdi-file-cog}" />
-                    <MenuItem Command="{Binding InstallKeysFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallKeysFromFolder}" Icon="{ext:Icon mdi-folder-cog}" />
+            <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarActions}" IsVisible="{Binding EnableNonGameRunningControls}">
+                <MenuItem Header="{ext:Locale MenuBarActionsInstallKeys}" Icon="{ext:Icon fa-solid fa-key}">
+                    <MenuItem Command="{Binding InstallKeysFromFile}" Header="{ext:Locale MenuBarFileActionsInstallKeysFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallKeysFromFolder}" Header="{ext:Locale MenuBarFileActionsInstallKeysFromFolder}" Icon="{ext:Icon mdi-folder-cog}" />
                 </MenuItem>
-                <MenuItem Header="{ext:Locale MenuBarToolsInstallFirmware}" Icon="{ext:Icon fa-solid fa-download}" IsEnabled="{Binding EnableNonGameRunningControls}">
-                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromFile}" Icon="{ext:Icon mdi-file-cog}" />
-                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarFileToolsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />
+                <MenuItem Header="{ext:Locale MenuBarActionsInstallFirmware}" Icon="{ext:Icon fa-solid fa-download}">
+                    <MenuItem Command="{Binding InstallFirmwareFromFile}" Header="{ext:Locale MenuBarActionsInstallFirmwareFromFile}" Icon="{ext:Icon mdi-file-cog}" />
+                    <MenuItem Command="{Binding InstallFirmwareFromFolder}" Header="{ext:Locale MenuBarActionsInstallFirmwareFromDirectory}" Icon="{ext:Icon mdi-folder-cog}" />
                 </MenuItem>
-                <MenuItem Header="{ext:Locale MenuBarToolsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
-                    <MenuItem Name="InstallFileTypesMenuItem" Header="{ext:Locale MenuBarToolsInstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered, Converter={x:Static BoolConverters.Not}}" />
-                    <MenuItem Name="UninstallFileTypesMenuItem" Header="{ext:Locale MenuBarToolsUninstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered}" />
+                <MenuItem Header="{ext:Locale MenuBarActionsManageFileTypes}" IsVisible="{Binding ManageFileTypesVisible}">
+                    <MenuItem Name="InstallFileTypesMenuItem" Header="{ext:Locale MenuBarActionsInstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered, Converter={x:Static BoolConverters.Not}}" />
+                    <MenuItem Name="UninstallFileTypesMenuItem" Header="{ext:Locale MenuBarActionsUninstallFileTypes}" IsEnabled="{Binding AreMimeTypesRegistered}" />
                 </MenuItem>
                 <Separator />
-                <MenuItem Name="XciTrimmerMenuItem" Header="{ext:Locale MenuBarToolsXCITrimmer}" IsEnabled="{Binding EnableNonGameRunningControls}" Icon="{ext:Icon fa-solid fa-scissors}" />
+                <MenuItem Name="XciTrimmerMenuItem" Header="{ext:Locale MenuBarActionsXCITrimmer}" Icon="{ext:Icon fa-solid fa-scissors}" />
             </MenuItem>
             <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}">
                 <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">

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

@@ -37,26 +37,20 @@ namespace Ryujinx.Ava.UI.Views.Main
             ToggleFileTypesMenuItem.ItemsSource = GenerateToggleFileTypeItems();
             ChangeLanguageMenuItem.ItemsSource = GenerateLanguageMenuItems();
 
-            MiiAppletMenuItem.Command = new AsyncRelayCommand(OpenMiiApplet);
-            CloseRyujinxMenuItem.Command = new RelayCommand(CloseWindow);
-            OpenSettingsMenuItem.Command = new AsyncRelayCommand(OpenSettings);
-            PauseEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Pause());
-            ResumeEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Resume());
-            StopEmulationMenuItem.Command = new AsyncRelayCommand(() => ViewModel.AppHost?.ShowExitPrompt().OrCompleted());
-            CheatManagerMenuItem.Command = new AsyncRelayCommand(async () =>
-            {
-                try
-                {
-                    await OpenCheatManagerForCurrentApp();
-                } catch {}
-            });
-            InstallFileTypesMenuItem.Command = new AsyncRelayCommand(InstallFileTypes);
-            UninstallFileTypesMenuItem.Command = new AsyncRelayCommand(UninstallFileTypes);
-            XciTrimmerMenuItem.Command = new AsyncRelayCommand(() => XCITrimmerWindow.Show(ViewModel));
-            AboutWindowMenuItem.Command = new AsyncRelayCommand(AboutWindow.Show);
-            CompatibilityListMenuItem.Command = new AsyncRelayCommand(CompatibilityList.Show);
+            MiiAppletMenuItem.Command = Commands.Create(OpenMiiApplet);
+            CloseRyujinxMenuItem.Command = Commands.Create(CloseWindow);
+            OpenSettingsMenuItem.Command = Commands.Create(OpenSettings);
+            PauseEmulationMenuItem.Command = Commands.Create(() => ViewModel.AppHost?.Pause());
+            ResumeEmulationMenuItem.Command = Commands.Create(() => ViewModel.AppHost?.Resume());
+            StopEmulationMenuItem.Command = Commands.Create(() => ViewModel.AppHost?.ShowExitPrompt().OrCompleted());
+            CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
+            InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
+            UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);
+            XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
+            AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
+            CompatibilityListMenuItem.Command = Commands.Create(CompatibilityList.Show);
             
-            UpdateMenuItem.Command = new AsyncRelayCommand(async () =>
+            UpdateMenuItem.Command = Commands.Create(async () =>
             {
                 if (Updater.CanUpdate(true))
                     await Updater.BeginUpdateAsync(true);
@@ -64,12 +58,12 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             FaqMenuItem.Command = 
                 SetupGuideMenuItem.Command = 
-                    LdnGuideMenuItem.Command = new RelayCommand<string>(OpenHelper.OpenUrl);
+                    LdnGuideMenuItem.Command = Commands.Create<string>(OpenHelper.OpenUrl);
             
             WindowSize720PMenuItem.Command = 
                 WindowSize1080PMenuItem.Command = 
                     WindowSize1440PMenuItem.Command = 
-                        WindowSize2160PMenuItem.Command = new RelayCommand<string>(ChangeWindowSize);
+                        WindowSize2160PMenuItem.Command = Commands.Create<string>(ChangeWindowSize);
         }
 
         private IEnumerable<CheckBox> GenerateToggleFileTypeItems() =>

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

@@ -105,6 +105,12 @@
                                 GroupName="Sort"
                                 IsChecked="{Binding IsSortedByTitle, Mode=OneTime}"
                                 Tag="Title" />
+                            <RadioButton
+                                Checked="Sort_Checked"
+                                Content="{ext:Locale DlcManagerTableHeadingTitleIdLabel}"
+                                GroupName="Sort"
+                                IsChecked="{Binding IsSortedByTitleId, Mode=OneTime}"
+                                Tag="TitleId" />
                             <RadioButton
                                 Checked="Sort_Checked"
                                 Content="{ext:Locale GameListHeaderDeveloper}"

src/Ryujinx/UI/Views/Settings/SettingsHacksView.axaml

@@ -29,7 +29,7 @@
                 <TextBlock
                     Foreground="{DynamicResource SecondaryTextColor}"
                     TextDecorations="Underline"
-                    Text="Game-specific hacks &amp; tricks to alleviate performance issues or crashing. Will cause issues." />
+                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Will cause issues." />
                 <StackPanel
                     Margin="0,10,0,0"
                     Orientation="Horizontal"

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml

@@ -114,8 +114,7 @@
                             Grid.Column="1"
                             MinWidth="90"
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale AddGameDirTooltip}"
-                            Click="AddGameDirButton_OnClick">
+                            ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
                             <TextBlock HorizontalAlignment="Center"
                                        Text="{ext:Locale SettingsTabGeneralAdd}" />
                         </Button>
@@ -168,8 +167,7 @@
                             Grid.Column="1"
                             MinWidth="90"
                             Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}"
-                            Click="AddAutoloadDirButton_OnClick">
+                            ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
                             <TextBlock HorizontalAlignment="Center"
                                        Text="{ext:Locale SettingsTabGeneralAdd}" />
                         </Button>

src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs

@@ -1,12 +1,17 @@
+using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Avalonia.VisualTree;
+using Gommon;
+using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.Utilities;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
@@ -18,31 +23,39 @@ namespace Ryujinx.Ava.UI.Views.Settings
         {
             InitializeComponent();
             ShowTitleBarBox.IsVisible = OperatingSystem.IsWindows();
+            AddGameDirButton.Command =
+                Commands.Create(() => AddDirButton(GameDirPathBox, ViewModel.GameDirectories, true));
+            AddAutoloadDirButton.Command =
+                Commands.Create(() => AddDirButton(AutoloadDirPathBox, ViewModel.AutoloadDirectories, false));
         }
 
-        private async void AddGameDirButton_OnClick(object sender, RoutedEventArgs e)
+        private async Task AddDirButton(TextBox addDirBox, AvaloniaList<string> directories, bool isGameList)
         {
-            string path = GameDirPathBox.Text;
+            string path = addDirBox.Text;
 
-            if (!string.IsNullOrWhiteSpace(path) && Directory.Exists(path) && !ViewModel.GameDirectories.Contains(path))
+            if (!string.IsNullOrWhiteSpace(path) && Directory.Exists(path) && !directories.Contains(path))
             {
-                ViewModel.GameDirectories.Add(path);
-                ViewModel.GameDirectoryChanged = true;
+                directories.Add(path);
+                
+                addDirBox.Clear();
+                
+                if (isGameList)
+                    ViewModel.GameDirectoryChanged = true;
+                else
+                    ViewModel.AutoloadDirectoryChanged = true;
             }
             else
             {
-                if (this.GetVisualRoot() is Window window)
-                {
-                    var result = await window.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                    {
-                        AllowMultiple = false,
-                    });
+                Optional<IStorageFolder> folder = await RyujinxApp.MainWindow.ViewModel.StorageProvider.OpenSingleFolderPickerAsync();
 
-                    if (result.Count > 0)
-                    {
-                        ViewModel.GameDirectories.Add(result[0].Path.LocalPath);
+                if (folder.HasValue)
+                {
+                    directories.Add(folder.Value.Path.LocalPath);
+                        
+                    if (isGameList)
                         ViewModel.GameDirectoryChanged = true;
-                    }
+                    else
+                        ViewModel.AutoloadDirectoryChanged = true;
                 }
             }
         }
@@ -63,33 +76,6 @@ namespace Ryujinx.Ava.UI.Views.Settings
             }
         }
 
-        private async void AddAutoloadDirButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            string path = AutoloadDirPathBox.Text;
-
-            if (!string.IsNullOrWhiteSpace(path) && Directory.Exists(path) && !ViewModel.AutoloadDirectories.Contains(path))
-            {
-                ViewModel.AutoloadDirectories.Add(path);
-                ViewModel.AutoloadDirectoryChanged = true;
-            }
-            else
-            {
-                if (this.GetVisualRoot() is Window window)
-                {
-                    var result = await window.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                    {
-                        AllowMultiple = false,
-                    });
-
-                    if (result.Count > 0)
-                    {
-                        ViewModel.AutoloadDirectories.Add(result[0].Path.LocalPath);
-                        ViewModel.AutoloadDirectoryChanged = true;
-                    }
-                }
-            }
-        }
-
         private void RemoveAutoloadDirButton_OnClick(object sender, RoutedEventArgs e)
         {
             int oldIndex = AutoloadDirsList.SelectedIndex;

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

@@ -691,6 +691,7 @@ namespace Ryujinx.Ava.UI.Windows
                 ApplicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs);
 
                 var autoloadDirs = ConfigurationState.Instance.UI.AutoloadDirs.Value;
+                autoloadDirs.ForEach(dir => Logger.Info?.Print(LogClass.Application, $"Auto loading DLC & updates from: {dir}"));
                 if (autoloadDirs.Count > 0)
                 {
                     var updatesLoaded = ApplicationLibrary.AutoLoadTitleUpdates(autoloadDirs, out int updatesRemoved);

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

@@ -28,15 +28,15 @@ namespace Ryujinx.Ava.UI.Windows
             InitializeComponent();
         }
 
-        public static async Task Show(MainWindowViewModel mainWindowViewModel)
+        public static async Task Show()
         {
             ContentDialog contentDialog = new()
             {
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = string.Empty,
-                Content = new XCITrimmerWindow(mainWindowViewModel),
-                Title = string.Format(LocaleManager.Instance[LocaleKeys.XCITrimmerWindowTitle]),
+                Content = new XCITrimmerWindow(RyujinxApp.MainWindow.ViewModel),
+                Title = LocaleManager.Instance[LocaleKeys.XCITrimmerWindowTitle]
             };
 
             Style bottomBorder = new(x => x.OfType<Grid>().Name("DialogSpace").Child().OfType<Border>());

src/Ryujinx/Updater.cs

@@ -87,6 +87,8 @@ namespace Ryujinx.Ava
 
                 return;
             }
+            
+            Logger.Info?.Print(LogClass.Application, "Checking for updates.");
 
             // Get latest version number from GitHub API
             try
@@ -140,6 +142,8 @@ namespace Ryujinx.Ava
                             OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
                         }
                     }
+                    
+                    Logger.Info?.Print(LogClass.Application, "Up to date.");
 
                     _running = false;
 
@@ -214,6 +218,8 @@ namespace Ryujinx.Ava
                     ? $"Canary {currentVersion} -> Canary {newVersion}"
                     : $"{currentVersion} -> {newVersion}";
                 
+                Logger.Info?.Print(LogClass.Application, $"Version found: {newVersionString}");
+                
             RequestUserToUpdate:
                 // Show a message asking the user if they want to update
                 UserResult shouldUpdate = await ContentDialogHelper.CreateUpdaterChoiceDialog(

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -840,7 +840,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             try
             {
                 // Remove any downloadable content which can no longer be located on disk
-                Logger.Notice.Print(LogClass.Application, $"Removing non-existing Title DLCs");
                 var dlcToRemove = _downloadableContents.Items
                     .Where(dlc => !File.Exists(dlc.Dlc.ContainerPath))
                     .ToList();
@@ -852,8 +851,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
                 foreach (string appDir in appDirs)
                 {
-                    Logger.Notice.Print(LogClass.Application, $"Auto loading DLC from: {appDir}");
-
                     if (_cancellationToken.Token.IsCancellationRequested)
                     {
                         return newDlcLoaded;
@@ -956,7 +953,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                 var titleIdsToRefresh = new HashSet<ulong>();
 
                 // Remove any updates which can no longer be located on disk
-                Logger.Notice.Print(LogClass.Application, $"Removing non-existing Title Updates");
                 var updatesToRemove = _titleUpdates.Items
                     .Where(it => !File.Exists(it.TitleUpdate.Path))
                     .ToList();
@@ -971,8 +967,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
                 foreach (string appDir in appDirs)
                 {
-                    Logger.Notice.Print(LogClass.Application, $"Auto loading updates from: {appDir}");
-
                     if (_cancellationToken.Token.IsCancellationRequested)
                     {
                         return numUpdatesLoaded;

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 59;
+        public const int CurrentVersion = 61;
 
         /// <summary>
         /// Version of the configuration file format
@@ -351,6 +351,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public bool StartFullscreen { get; set; }
 
+        /// <summary>
+        /// Start games with UI hidden
+        /// </summary>
+        public bool StartNoUI { get; set; }
+
         /// <summary>
         /// Show console window
         /// </summary>

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

@@ -127,6 +127,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.GridSize.Value = cff.GridSize;
             UI.ApplicationSort.Value = cff.ApplicationSort;
             UI.StartFullscreen.Value = cff.StartFullscreen;
+            UI.StartNoUI.Value = cff.StartNoUI;
             UI.ShowConsole.Value = cff.ShowConsole;
             UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
             UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
@@ -262,15 +263,12 @@ namespace Ryujinx.Ava.Utilities.Configuration
                         }),
                 (30, static cff =>
                 {
-                    foreach (InputConfig config in cff.InputConfig)
+                    foreach (StandardControllerInputConfig config in cff.InputConfig.OfType<StandardControllerInputConfig>())
                     {
-                        if (config is StandardControllerInputConfig controllerConfig)
+                        config.Rumble = new RumbleConfigController
                         {
-                            controllerConfig.Rumble = new RumbleConfigController
-                            {
-                                EnableRumble = false, StrongRumble = 1f, WeakRumble = 1f,
-                            };
-                        }
+                            EnableRumble = false, StrongRumble = 1f, WeakRumble = 1f,
+                        };
                     }
                 }),
                 (31, static cff => cff.BackendThreading = BackendThreading.Auto),
@@ -414,6 +412,18 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // This was accidentally enabled by default when it was PRed. That is not what we want,
                     // so as a compromise users who want to use it will simply need to re-enable it once after updating.
                     cff.IgnoreApplet = false;
+                }),
+                (60, static cff => cff.StartNoUI = false),
+                (61, static cff =>
+                {
+                    foreach (StandardControllerInputConfig config in cff.InputConfig.OfType<StandardControllerInputConfig>())
+                    {
+                        config.Led = new LedConfigController
+                        {
+                            EnableLed = false,
+                            LedColor = 328189
+                        };
+                    }
                 })
             );
     }

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

@@ -152,6 +152,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> StartFullscreen { get; private set; }
 
+            /// <summary>
+            /// Start games with UI hidden
+            /// </summary>
+            public ReactiveObject<bool> StartNoUI { get; private set; }
+
             /// <summary>
             /// Hide / Show Console Window
             /// </summary>
@@ -192,6 +197,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 WindowStartup = new WindowStartupSettings();
                 BaseStyle = new ReactiveObject<string>();
                 StartFullscreen = new ReactiveObject<bool>();
+                StartNoUI = new ReactiveObject<bool>();
                 GameListViewMode = new ReactiveObject<int>();
                 ShowNames = new ReactiveObject<bool>();
                 GridSize = new ReactiveObject<int>();

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -125,6 +125,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 ApplicationSort = UI.ApplicationSort,
                 IsAscendingOrder = UI.IsAscendingOrder,
                 StartFullscreen = UI.StartFullscreen,
+                StartNoUI = UI.StartNoUI,
                 ShowConsole = UI.ShowConsole,
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
@@ -233,6 +234,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.ApplicationSort.Value = 0;
             UI.IsAscendingOrder.Value = true;
             UI.StartFullscreen.Value = false;
+            UI.StartNoUI.Value = false;
             UI.ShowConsole.Value = true;
             UI.WindowStartup.WindowSizeWidth.Value = 1280;
             UI.WindowStartup.WindowSizeHeight.Value = 760;

src/Ryujinx/Utilities/StorageProviderExtensions.cs

@@ -0,0 +1,47 @@
+using Avalonia.Platform.Storage;
+using Gommon;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.Utilities
+{
+    public static class StorageProviderExtensions
+    {
+        public static async Task<Optional<IStorageFolder>> OpenSingleFolderPickerAsync(this IStorageProvider storageProvider, FolderPickerOpenOptions openOptions = null) =>
+            await storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, false))
+                .Then(folders => folders.FindFirst());
+
+        public static async Task<Optional<IStorageFile>> OpenSingleFilePickerAsync(this IStorageProvider storageProvider, FilePickerOpenOptions openOptions = null) =>
+            await storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, false))
+                .Then(files => files.FindFirst());
+        
+        public static async Task<Optional<IReadOnlyList<IStorageFolder>>> OpenMultiFolderPickerAsync(this IStorageProvider storageProvider, FolderPickerOpenOptions openOptions = null) =>
+            await storageProvider.OpenFolderPickerAsync(FixOpenOptions(openOptions, true))
+                .Then(folders => folders.Count > 0 ? Optional.Of(folders) : default);
+
+        public static async Task<Optional<IReadOnlyList<IStorageFile>>> OpenMultiFilePickerAsync(this IStorageProvider storageProvider, FilePickerOpenOptions openOptions = null) =>
+            await storageProvider.OpenFilePickerAsync(FixOpenOptions(openOptions, true))
+                .Then(files => files.Count > 0 ? Optional.Of(files) : default);
+        
+        private static FilePickerOpenOptions FixOpenOptions(this FilePickerOpenOptions openOptions, bool allowMultiple)
+        {
+            if (openOptions is null)
+                return new FilePickerOpenOptions { AllowMultiple = allowMultiple };
+
+            openOptions.AllowMultiple = allowMultiple;
+            
+            return openOptions;
+        }
+        
+        private static FolderPickerOpenOptions FixOpenOptions(this FolderPickerOpenOptions openOptions, bool allowMultiple)
+        {
+            if (openOptions is null)
+                return new FolderPickerOpenOptions { AllowMultiple = allowMultiple };
+
+            openOptions.AllowMultiple = allowMultiple;
+            
+            return openOptions;
+        }
+    }
+}