Merge 48f9ada59b into fe9d8d05bd

UI: Fixed the Amiibo keybind only working when the UI had been updated.
misc: chore: Remove duplicated styling blocks in MainMenuBarView in favor of a reusable Avalonia Style.
2025-01-22 09:07:49 +09:00 · 2025-01-21 18:00:51 -06:00 · 2025-01-21 17:50:55 -06:00 · 2025-01-21 17:36:51 -06:00 · 2025-01-21 17:35:22 -06:00 · 2025-01-21 17:10:54 -06:00
124 changed files with 6872 additions and 5311 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,7 +22,7 @@ body:
    id: log
    attributes:
      label: Log file
-      description: A log file will help our developers to better diagnose and fix the issue.
+      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
      placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
    validations:
      required: true
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,11 +129,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 14
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/.github/workflows/canary.yml
+++ b/.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

@@ -210,11 +210,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,16 +3,6 @@ name: Release job
 on:
  workflow_dispatch:
    inputs: {}
-  push:
-    branches: [ release ]
-    paths-ignore:
-      - '.github/**'
-      - 'docs/**'
-      - 'assets/**'
-      - '*.yml'
-      - '*.json'
-      - '*.config'
-      - '*.md'

 concurrency: release

@@ -193,7 +183,7 @@ jobs:

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

@@ -201,11 +191,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17

      - name: Install rcodesign
        run: |
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,13 +3,13 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
    <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -18,7 +18,7 @@
    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-    <PackageVersion Include="Concentus" Version="2.2.0" />
+    <PackageVersion Include="Concentus" Version="2.2.2" />
    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
    <PackageVersion Include="DynamicData" Version="9.0.4" />
    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -26,7 +26,7 @@
    <PackageVersion Include="LibHac" Version="0.19.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -48,11 +48,11 @@
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
    <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
    <PackageVersion Include="System.Management" Version="9.0.0" />
--- a/distribution/macos/bundle_fix_up.py
+++ b/distribution/macos/bundle_fix_up.py
@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
    OTOOL = shutil.which("llvm-otool")
    if OTOOL is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
            otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
            if otool_path is not None:
                OTOOL = otool_path
--- a/distribution/macos/construct_universal_dylib.py
+++ b/distribution/macos/construct_universal_dylib.py
@@ -26,7 +26,7 @@ else:
    LIPO = shutil.which("llvm-lipo")

    if LIPO is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
            lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
            if lipo_path is not None:
                LIPO = lipo_path
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
    fi
 else
    LIPO=lipo
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
    fi
 else
    LIPO=lipo
--- a/distribution/macos/shortcut-template.plist
+++ b/distribution/macos/shortcut-template.plist
@@ -19,7 +19,7 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
+	<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
--- a/src/Ryujinx.Common/RyujinxException.cs
+++ b/src/Ryujinx.Common/RyujinxException.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Ryujinx.Common
+{
+    public class RyujinxException : Exception
+    {
+        public RyujinxException(string message) : base(message)
+        { }
+    }
+}
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -1,4 +1,4 @@
-using Gommon;
+using Gommon;
 using Ryujinx.Common.Configuration;
 using System;
 using System.Linq;
@@ -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,93 +58,117 @@ namespace Ryujinx.Common

        public static readonly string[] DiscordGameAssetKeys =
        [
-            "010055d009f78000", // Fire Emblem: Three Houses
-            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
+                //All games are in Alphabetical order by Game name.
+            
+                          //Dragon Quest Franchise
+            "010008900705c000", // Dragon Quest Builders
+            "010042000a986000", // Dragon Quest Builders 2
+            
+                          //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

-            "010003f003a34000", // Pokémon: Let's Go Pikachu!
-            "0100187003a36000", // Pokémon: Let's Go Eevee!
-            "0100abf008968000", // Pokémon Sword
-            "01008db008c2c000", // Pokémon Shield
+                          //The Pokémon Franchise
+            "0100f4300bf2c000", // New Pokémon Snap
            "0100000011d90000", // Pokémon Brilliant Diamond
-            "010018e011d92000", // Pokémon Shining Pearl
            "01001f5010dfa000", // Pokémon Legends: Arceus
+            "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
            "0100a3d008c5c000", // Pokémon Scarlet
+            "01008db008c2c000", // Pokémon Shield
+            "010018e011d92000", // Pokémon Shining Pearl
+            "0100abf008968000", // Pokémon Sword
            "01008f6008c5e000", // Pokémon Violet
            "0100b3f000be2000", // Pokkén Tournament DX
-            "0100f4300bf2c000", // New Pokémon Snap
+            "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
@@ -148,33 +183,44 @@ 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
            "0100744001588000", // Cars 3: Driven to Win
            "0100b41013c82000", // Cruis'n Blast
+            "010085900337e000", // Death Squared
            "01001b300b9be000", // Diablo III: Eternal Collection
            "01008c8012920000", // Dying Light Platinum Edition
            "01001cc01b2d4000", // Goat Simulator 3
+            "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
@@ -190,6 +236,8 @@ namespace Ryujinx.Common
            "01000a10041ea000", // The Elder Scrolls V: Skyrim
            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
            "010080b00ad66000", // Undertale
+            "010069401adb8000", // Unicorn Overlord
+            "0100534009ff2000", // Yonder - The cloud catcher chronicles
        ];
    }
 }
--- a/src/Ryujinx.Graphics.GAL/Capabilities.cs
+++ b/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;
--- a/src/Ryujinx.Graphics.GAL/Face.cs
+++ b/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,
--- a/src/Ryujinx.Graphics.GAL/IPipeline.cs
+++ b/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();
--- a/src/Ryujinx.Graphics.GAL/Multithreading/Commands/SetFaceCullingCommand.cs
+++ b/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);
        }
    }
 }
--- a/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs
+++ b/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();
--- a/src/Ryujinx.Graphics.GAL/ProgramPipelineState.cs
+++ b/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)
--- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
+++ b/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,
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
+++ b/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";
--- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/ParallelDiskCacheLoader.cs
+++ b/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>
--- a/src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs
+++ b/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,
--- a/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
+++ b/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);
--- a/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs
+++ b/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));
        }
--- a/src/Ryujinx.Graphics.Vulkan/EnumConversion.cs
+++ b/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
--- a/src/Ryujinx.Graphics.Vulkan/HardwareCapabilities.cs
+++ b/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;
--- a/src/Ryujinx.Graphics.Vulkan/HelperShader.cs
+++ b/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));
            }

--- a/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
+++ b/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()
--- a/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
+++ b/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);
                }
            }
--- a/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs
+++ b/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)
--- a/src/Ryujinx.Graphics.Vulkan/PipelineHelperShader.cs
+++ b/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)
--- a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
--- a/src/Ryujinx.Graphics.Vulkan/PipelineUid.cs
+++ b/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++)
            {
--- a/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
+++ b/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;
--- a/src/Ryujinx.Graphics.Vulkan/Vendor.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Vendor.cs
@@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
                DriverId.MesaDozen => "Dozen",
                DriverId.MesaNvk => "NVK",
                DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
-                DriverId.MesaAgxv => "Honeykrisp",
+                DriverId.MesaHoneykrisp => "Honeykrisp",
                _ => id.ToString(),
            };
        }
--- a/src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs
+++ b/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)
                {
--- a/src/Ryujinx.Graphics.Vulkan/VertexBufferUpdater.cs
+++ b/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,
--- a/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs
+++ b/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,
--- a/src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+++ b/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,
--- a/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
@@ -26,10 +26,20 @@ namespace Ryujinx.HLE.HOS.Applets
        {
            _normalSession = normalSession;
            _interactiveSession = interactiveSession;
-
-            // TODO(jduncanator): Parse PlayerSelectConfig from input data
-            _normalSession.Push(BuildResponse());
-
+            
+            UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
+            if (selected == null)
+            {
+                _normalSession.Push(BuildResponse());
+            }
+            else if (selected.UserId == new UserId("00000000000000000000000000000080"))
+            {
+                _normalSession.Push(BuildGuestResponse());
+            }
+            else
+            {
+                _normalSession.Push(BuildResponse(selected));
+            }
            AppletStateChanged?.Invoke(this, null);

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

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

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

-            currentUser.UserId.Write(writer);
+            selectedUser.UserId.Write(writer);
+
+            return stream.ToArray();
+        }
+        
+        private byte[] BuildGuestResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            
+            writer.Write(new byte());
+
+            return stream.ToArray();
+        }
+        
+        private byte[] BuildResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            
+            writer.Write((ulong)PlayerSelectResult.Failure);

            return stream.ToArray();
        }
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
@@ -176,9 +176,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                        AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                        AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);

-                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
-                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
-                        else if (isApplication)
+                        if (isApplication)
                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");

                        break;
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
@@ -56,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc
            ProfilesJson profilesJson = JsonHelper.DeserializeFromFile(_profilesJsonPath, _serializerContext.ProfilesJson);

            return profilesJson.Profiles
-                .FindFirst(profile => profile.AccountState == AccountState.Open)
+                .FindFirst(profile => profile.UserId == profilesJson.LastOpened)
                .Convert(profileJson => new UserProfile(new UserId(profileJson.UserId), profileJson.Name,
                    profileJson.Image, profileJson.LastModifiedTimestamp));
        }
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
--- a/src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
@@ -702,6 +702,18 @@ namespace Ryujinx.HLE.HOS.Services.Hid

            return ResultCode.Success;
        }
+        
+        [CommandCmif(92)]
+        // SetGestureOutputRanges(pid, ushort Unknown0)
+        public ResultCode SetGestureOutputRanges(ServiceCtx context)
+        {
+            ulong pid = context.Request.HandleDesc.PId;
+            ushort unknown0 = context.RequestData.ReadUInt16();
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, unknown0 });
+
+            return ResultCode.Success;
+        }

        [CommandCmif(100)]
        // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag)
--- a/src/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/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)
--- a/src/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs
+++ b/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;
        }

--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
@@ -26,7 +26,17 @@ namespace Ryujinx.HLE.Loaders.Processes

        private ulong _latestPid;

-        public ProcessResult ActiveApplication => _processesByPid[_latestPid];
+        public ProcessResult ActiveApplication
+        {
+            get
+            {
+                if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
+                    throw new RyujinxException(
+                        $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
+                
+                return value;
+            }
+        }

        public ProcessLoader(Switch device)
        {
--- a/src/Ryujinx.HLE/Ryujinx.HLE.csproj
+++ b/src/Ryujinx.HLE/Ryujinx.HLE.csproj
@@ -48,6 +48,7 @@
    <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" />
    <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" />
    <EmbeddedResource Include="HOS\Services\Account\Acc\DefaultUserImage.jpg" />
+    <EmbeddedResource Include="HOS\Services\Account\Acc\GuestUserImage.jpg" />
  </ItemGroup>

 </Project>
--- a/src/Ryujinx.HLE/UI/IHostUIHandler.cs
+++ b/src/Ryujinx.HLE/UI/IHostUIHandler.cs
@@ -1,4 +1,5 @@
 using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;

 namespace Ryujinx.HLE.UI
@@ -59,5 +60,11 @@ namespace Ryujinx.HLE.UI
        /// Gets fonts and colors used by the host.
        /// </summary>
        IHostUITheme HostUITheme { get; }
+        
+        
+        /// <summary>
+        /// Displays the player select dialog and returns the selected profile.
+        /// </summary>
+        UserProfile ShowPlayerSelectDialog();
    }
 }
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\Controller_JoyConLeft.svg" />
-    <None Remove="Resources\Controller_JoyConPair.svg" />
-    <None Remove="Resources\Controller_JoyConRight.svg" />
-    <None Remove="Resources\Controller_ProCon.svg" />
-    <None Remove="Resources\Icon_NCA.png" />
-    <None Remove="Resources\Icon_NRO.png" />
-    <None Remove="Resources\Icon_NSO.png" />
-    <None Remove="Resources\Icon_NSP.png" />
-    <None Remove="Resources\Icon_XCI.png" />
-    <None Remove="Resources\Logo_Amiibo.png" />
-    <None Remove="Resources\Logo_Discord.png" />
-    <None Remove="Resources\Logo_GitHub.png" />
-    <None Remove="Resources\Logo_Ryujinx.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DiscordRichPresence" />
-    <PackageReference Include="DynamicData" />
-    <PackageReference Include="securifybv.ShellLink" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -489,7 +489,7 @@ namespace Ryujinx.Ava

            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            });

            _viewModel.SetUiProgressHandlers(Device);
@@ -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":
@@ -872,7 +876,7 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }

@@ -881,11 +885,11 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
            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;
                }
--- a/src/Ryujinx/Assets/Styles/CheckboxMenuItemStyle.axaml
+++ b/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>
+
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
--- a/src/Ryujinx/Common/ApplicationHelper.cs
+++ b/src/Ryujinx/Common/ApplicationHelper.cs
@@ -295,6 +295,142 @@ namespace Ryujinx.Ava.Common
            };
            extractorThread.Start();
        }
+        
+        public static void ExtractAoc(string destination, string updateFilePath, string updateName)
+        {
+            var cancellationToken = new CancellationTokenSource();
+
+            UpdateWaitWindow waitingDialog = new(
+                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
+                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, NcaSectionType.Data, Path.GetFileName(updateFilePath)),
+                cancellationToken);
+
+            Thread extractorThread = new(() =>
+            {
+                Dispatcher.UIThread.Post(waitingDialog.Show);
+
+                using FileStream file = new(updateFilePath, FileMode.Open, FileAccess.Read);
+
+                Nca publicDataNca = null;
+
+                string extension = Path.GetExtension(updateFilePath).ToLower();
+                if (extension is ".nsp")
+                {
+                    var pfsTemp = new PartitionFileSystem();
+                    pfsTemp.Initialize(file.AsStorage()).ThrowIfFailure();
+                    IFileSystem pfs = pfsTemp;
+
+                    foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
+                    {
+                        using var ncaFile = new UniqueRef<IFile>();
+
+                        pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
+
+                        Nca nca = new(_virtualFileSystem.KeySet, ncaFile.Get.AsStorage());
+                        if (nca.Header.ContentType is NcaContentType.PublicData && nca.SectionExists(NcaSectionType.Data))
+                        {
+                            publicDataNca = nca;
+                        }
+                    }
+                }
+
+                if (publicDataNca is null)
+                {
+                    Logger.Error?.Print(LogClass.Application, "Extraction failure. The  NCA was not present in the selected file");
+
+                    Dispatcher.UIThread.InvokeAsync(async () =>
+                    {
+                        waitingDialog.Close();
+
+                        await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionMainNcaNotFoundErrorMessage]);
+                    });
+
+                    return;
+                }
+
+                IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
+                    ? IntegrityCheckLevel.ErrorOnInvalid
+                    : IntegrityCheckLevel.None;
+
+                int index = Nca.GetSectionIndexFromType(NcaSectionType.Data, publicDataNca.Header.ContentType);
+
+                try
+                {
+                    IFileSystem ncaFileSystem = publicDataNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
+
+                    FileSystemClient fsClient = _horizonClient.Fs;
+
+                    string source = DateTime.Now.ToFileTime().ToString()[10..];
+                    string output = DateTime.Now.ToFileTime().ToString()[10..];
+
+                    using var uniqueSourceFs = new UniqueRef<IFileSystem>(ncaFileSystem);
+                    using var uniqueOutputFs = new UniqueRef<IFileSystem>(new LocalFileSystem(destination));
+
+                    fsClient.Register(source.ToU8Span(), ref uniqueSourceFs.Ref);
+                    fsClient.Register(output.ToU8Span(), ref uniqueOutputFs.Ref);
+
+                    (Result? resultCode, bool canceled) = CopyDirectory(fsClient, $"{source}:/", $"{output}:/", cancellationToken.Token);
+
+                    if (!canceled)
+                    {
+                        if (resultCode.Value.IsFailure())
+                        {
+                            Logger.Error?.Print(LogClass.Application, $"LibHac returned error code: {resultCode.Value.ErrorCode}");
+
+                            Dispatcher.UIThread.InvokeAsync(async () =>
+                            {
+                                waitingDialog.Close();
+
+                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionCheckLogErrorMessage]);
+                            });
+                        }
+                        else if (resultCode.Value.IsSuccess())
+                        {
+                            Dispatcher.UIThread.Post(waitingDialog.Close);
+
+                            NotificationHelper.ShowInformation(
+                                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
+                                $"{updateName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
+                        }
+                    }
+
+                    fsClient.Unmount(source.ToU8Span());
+                    fsClient.Unmount(output.ToU8Span());
+                }
+                catch (ArgumentException ex)
+                {
+                    Logger.Error?.Print(LogClass.Application, $"{ex.Message}");
+
+                    Dispatcher.UIThread.InvokeAsync(async () =>
+                    {
+                        waitingDialog.Close();
+
+                        await ContentDialogHelper.CreateErrorDialog(ex.Message);
+                    });
+                }
+            })
+            {
+                Name = "GUI.AocExtractorThread",
+                IsBackground = true,
+            };
+            extractorThread.Start();
+        }
+
+        public static async Task ExtractAoc(IStorageProvider storageProvider, string updateFilePath, string updateName)
+        {
+            var result = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+            {
+                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
+                AllowMultiple = false,
+            });
+
+            if (result.Count == 0)
+            {
+                return;
+            }
+
+            ExtractAoc(result[0].Path.LocalPath, updateFilePath, updateName);
+        }


        public static async Task ExtractSection(IStorageProvider storageProvider, NcaSectionType ncaSectionType, string titleFilePath, string titleName, int programIndex = 0)
--- a/src/Ryujinx/Common/Models/DownloadableContentModel.cs
+++ b/src/Ryujinx/Common/Models/DownloadableContentModel.cs
@@ -6,7 +6,7 @@ namespace Ryujinx.Ava.Common.Models
        public bool IsBundled { get; } = System.IO.Path.GetExtension(ContainerPath)?.ToLower() == ".xci";

        public string FileName => System.IO.Path.GetFileName(ContainerPath);
-        public string TitleIdStr => TitleId.ToString("x16");
+        public string TitleIdStr => TitleId.ToString("x16").ToUpper();
        public ulong TitleIdBase => TitleId & ~0x1FFFUL;
    }
 }
--- a/src/Ryujinx/Common/ThemeManager.cs
+++ b/src/Ryujinx/Common/ThemeManager.cs
@@ -4,11 +4,11 @@ namespace Ryujinx.Ava.Common
 {
    public static class ThemeManager
    {
-        public static event EventHandler ThemeChanged;
+        public static event Action ThemeChanged;

        public static void OnThemeChanged()
        {
-            ThemeChanged?.Invoke(null, EventArgs.Empty);
+            ThemeChanged?.Invoke();
        }
    }
 }
--- a/src/Ryujinx/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/DiscordIntegrationModule.cs
@@ -1,6 +1,8 @@
 using DiscordRPC;
+using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
+using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -45,16 +47,7 @@ namespace Ryujinx.Ava
            };

            ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
-            TitleIDs.CurrentApplication.Event += (_, e) =>
-            {
-                if (e.NewValue)
-                    SwitchToPlayingState(
-                        ApplicationLibrary.LoadAndSaveMetaData(e.NewValue),
-                        Switch.Shared.Processes.ActiveApplication
-                    );
-                else 
-                    SwitchToMainState();
-            };
+            TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
        }

        private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -75,11 +68,23 @@ namespace Ryujinx.Ava
                    _discordClient = new DiscordRpcClient(ApplicationId);

                    _discordClient.Initialize();
-                    _discordClient.SetPresence(_discordPresenceMain);
+
+                    Use(TitleIDs.CurrentApplication);
                }
            }
        }

+        public static void Use(Optional<string> titleId)
+        {
+            if (titleId.TryGet(out string tid))
+                SwitchToPlayingState(
+                    ApplicationLibrary.LoadAndSaveMetaData(tid), 
+                    Switch.Shared.Processes.ActiveApplication
+                );
+            else 
+                SwitchToMainState();
+        }
+
        private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
        {
            _discordClient?.SetPresence(new RichPresence
@@ -93,7 +98,7 @@ namespace Ryujinx.Ava
                },
                Details = TruncateToByteLength($"Playing {appMeta.Title}"),
                State = appMeta.LastPlayed.HasValue && appMeta.TimePlayed.TotalSeconds > 5
-                    ? $"Total play time: {appMeta.TimePlayed.Humanize(2, false, maxUnit: TimeUnit.Hour)}"
+                    ? $"Total play time: {ValueFormatUtils.FormatTimeSpan(appMeta.TimePlayed)}"
                    : "Never played",
                Timestamps = Timestamps.Now
            });
--- a/src/Ryujinx/Headless/HeadlessRyujinx.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -228,8 +228,6 @@ namespace Ryujinx.Headless
            _inputConfiguration ??= [];
            _enableKeyboard = option.EnableKeyboard;
            _enableMouse = option.EnableMouse;
-
-
            
            LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
            LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
@@ -301,7 +299,10 @@ namespace Ryujinx.Headless
                _userChannelPersistence.ShouldRestart = false;
            }

-            _inputManager.Dispose();
+            try
+            {
+                _inputManager.Dispose();
+            } catch {}

            return;
            
@@ -338,12 +339,12 @@ namespace Ryujinx.Headless
        {
            string label = state switch
            {
-                LoadState => $"PTC : {current}/{total}",
-                ShaderCacheState => $"Shaders : {current}/{total}",
-                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}"),
+                LoadState => "PTC",
+                ShaderCacheState => "Shaders",
+                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}")
            };

-            Logger.Info?.Print(LogClass.Application, label);
+            Logger.Info?.Print(LogClass.Application, $"{label} : {current}/{total}");
        }

        private static WindowBase CreateWindow(Options options)
--- a/src/Ryujinx/Headless/Ryujinx.bmp
+++ b/src/Ryujinx/Headless/Ryujinx.bmp
--- a/src/Ryujinx/Headless/StatusUpdatedEventArgs.cs
+++ b/src/Ryujinx/Headless/StatusUpdatedEventArgs.cs
@@ -1,21 +0,0 @@
-using System;
-
-namespace Ryujinx.Headless
-{
-    class StatusUpdatedEventArgs(
-        string vSyncMode,
-        string dockedMode,
-        string aspectRatio,
-        string gameStatus,
-        string fifoStatus,
-        string gpuName)
-        : EventArgs
-    {
-        public string VSyncMode = vSyncMode;
-        public string DockedMode = dockedMode;
-        public string AspectRatio = aspectRatio;
-        public string GameStatus = gameStatus;
-        public string FifoStatus = fifoStatus;
-        public string GpuName = gpuName;
-    }
-}
--- a/src/Ryujinx/Headless/Windows/MetalWindow.cs
+++ b/src/Ryujinx/Headless/Windows/MetalWindow.cs
@@ -26,7 +26,7 @@ namespace Ryujinx.Headless
            bool ignoreControllerApplet)
            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }

-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_METAL;

        protected override void InitializeWindowRenderer()
        {
--- a/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
+++ b/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
@@ -108,8 +108,7 @@ namespace Ryujinx.Headless
                }
            }
        }
-
-        private readonly GraphicsDebugLevel _glLogLevel;
+        
        private SDL2OpenGLContext _openGLContext;

        public OpenGLWindow(
@@ -121,15 +120,14 @@ namespace Ryujinx.Headless
            bool ignoreControllerApplet)
            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
        {
-            _glLogLevel = glLogLevel;
        }

-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;

        protected override void InitializeWindowRenderer()
        {
            // Ensure to not share this context with other contexts before this point.
-            SetupOpenGLAttributes(false, _glLogLevel);
+            SetupOpenGLAttributes(false, GlLogLevel);
            nint context = SDL_GL_CreateContext(WindowHandle);
            CheckResult(SDL_GL_SetSwapInterval(1));

--- a/src/Ryujinx/Headless/Windows/VulkanWindow.cs
+++ b/src/Ryujinx/Headless/Windows/VulkanWindow.cs
@@ -10,8 +10,6 @@ namespace Ryujinx.Headless
 {
    class VulkanWindow : WindowBase
    {
-        private readonly GraphicsDebugLevel _glLogLevel;
-
        public VulkanWindow(
            InputManager inputManager,
            GraphicsDebugLevel glLogLevel,
@@ -21,10 +19,9 @@ namespace Ryujinx.Headless
            bool ignoreControllerApplet)
            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
        {
-            _glLogLevel = glLogLevel;
        }

-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_VULKAN;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_VULKAN;

        protected override void InitializeWindowRenderer() { }

--- a/src/Ryujinx/Headless/Windows/WindowBase.cs
+++ b/src/Ryujinx/Headless/Windows/WindowBase.cs
@@ -1,14 +1,15 @@
 using Humanizer;
-using LibHac.Tools.Fs;
 using Ryujinx.Ava;
+using Ryujinx.Ava.UI.Models;
+using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
-using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input;
@@ -26,6 +27,7 @@ using static SDL2.SDL;
 using AntiAliasing = Ryujinx.Common.Configuration.AntiAliasing;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Switch = Ryujinx.HLE.Switch;
+using UserProfile = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;

 namespace Ryujinx.Headless
 {
@@ -53,8 +55,6 @@ namespace Ryujinx.Headless
        public Switch Device { get; private set; }
        public IRenderer Renderer { get; private set; }

-        public event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
-
        protected nint WindowHandle { get; set; }

        public IHostUITheme HostUITheme { get; }
@@ -72,7 +72,7 @@ namespace Ryujinx.Headless
        protected SDL2MouseDriver MouseDriver;
        private readonly InputManager _inputManager;
        private readonly IKeyboard _keyboardInterface;
-        private readonly GraphicsDebugLevel _glLogLevel;
+        protected readonly GraphicsDebugLevel GlLogLevel;
        private readonly Stopwatch _chrono;
        private readonly long _ticksPerFrame;
        private readonly CancellationTokenSource _gpuCancellationTokenSource;
@@ -104,7 +104,7 @@ namespace Ryujinx.Headless
            NpadManager = _inputManager.CreateNpadManager();
            TouchScreenManager = _inputManager.CreateTouchScreenManager();
            _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
-            _glLogLevel = glLogLevel;
+            GlLogLevel = glLogLevel;
            _chrono = new Stopwatch();
            _ticksPerFrame = Stopwatch.Frequency / TargetFps;
            _gpuCancellationTokenSource = new CancellationTokenSource();
@@ -137,7 +137,7 @@ namespace Ryujinx.Headless

        private void SetWindowIcon()
        {
-            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
+            Stream iconStream = EmbeddedResources.GetStream("Ryujinx/Assets/UIImages/Logo_Ryujinx.png");
            byte[] iconBytes = new byte[iconStream!.Length];

            if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
@@ -191,7 +191,7 @@ namespace Ryujinx.Headless
                FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
            }

-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);

            if (WindowHandle == nint.Zero)
            {
@@ -246,7 +246,7 @@ namespace Ryujinx.Headless

        protected abstract void SwapBuffers();

-        public abstract SDL_WindowFlags GetWindowFlags();
+        public abstract SDL_WindowFlags WindowFlags { get; }

        private string GetGpuDriverName()
        {
@@ -268,7 +268,7 @@ namespace Ryujinx.Headless
        {
            InitializeWindowRenderer();

-            Device.Gpu.Renderer.Initialize(_glLogLevel);
+            Device.Gpu.Renderer.Initialize(GlLogLevel);

            InitializeRenderer();

@@ -308,21 +308,6 @@ namespace Ryujinx.Headless

                    if (_ticks >= _ticksPerFrame)
                    {
-                        string dockedMode = Device.System.State.DockedMode ? "Docked" : "Handheld";
-                        float scale = GraphicsConfig.ResScale;
-                        if (scale != 1)
-                        {
-                            dockedMode += $" ({scale}x)";
-                        }
-
-                        StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
-                            Device.VSyncMode.ToString(),
-                            dockedMode,
-                            Device.Configuration.AspectRatio.ToText(),
-                            $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
-                            $"FIFO: {Device.Statistics.GetFifoPercent():0.00} %",
-                            $"GPU: {_gpuDriverName}"));
-
                        _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
                    }
                }
@@ -572,5 +557,10 @@ namespace Ryujinx.Headless
                SDL2Driver.Instance.Dispose();
            }
        }
+        
+        public UserProfile ShowPlayerSelectDialog()
+        {
+            return AccountSaveDataManager.GetLastUsedUser();
+        }
    }
 }
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -21,6 +21,7 @@ using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL2.Common;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -229,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
@@ -243,16 +247,33 @@ namespace Ryujinx.Ava
                    : $"Launch Mode: {AppDataManager.Mode}");
        }

-        internal static void ProcessUnhandledException(object sender, Exception ex, bool isTerminating)
+        internal static void ProcessUnhandledException(object sender, Exception initialException, bool isTerminating)
        {
            Logger.Log log = Logger.Error ?? Logger.Notice;
-            string message = $"Unhandled exception caught: {ex}";

-            // ReSharper disable once ConstantConditionalAccessQualifier
-            if (sender?.GetType()?.AsPrettyString() is { } senderName)
-                log.Print(LogClass.Application, message, senderName);
+            List<Exception> exceptions = [];
+
+            if (initialException is AggregateException ae)
+            {
+                exceptions.AddRange(ae.InnerExceptions);
+            }
            else
-                log.PrintMsg(LogClass.Application, message);
+            {
+                exceptions.Add(initialException);
+            }
+
+            foreach (var e in exceptions)
+            {
+                string message = $"Unhandled exception caught: {e}";
+                // ReSharper disable once ConstantConditionalAccessQualifier
+                if (sender?.GetType()?.AsPrettyString() is { } senderName)
+                    log.Print(LogClass.Application, message, senderName);
+                else
+                    log.PrintMsg(LogClass.Application, message);
+            }
+            
+
+

            if (isTerminating)
                Exit();
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/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" />
@@ -166,7 +168,6 @@
    <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
-    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
  </ItemGroup>
  <ItemGroup>
    <AdditionalFiles Include="Assets\locales.json" />
@@ -174,4 +175,5 @@
  <ItemGroup>
    <Folder Include="Assets\Fonts\Mono\" />
  </ItemGroup>
+
 </Project>
--- a/src/Ryujinx/RyujinxApp.axaml
+++ b/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>
--- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
@@ -1,17 +1,24 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
+using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
+using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using System;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading;

 namespace Ryujinx.Ava.UI.Applet
@@ -253,5 +260,59 @@ namespace Ryujinx.Ava.UI.Applet
        }

        public IDynamicTextInputHandler CreateDynamicTextInputHandler() => new AvaloniaDynamicTextInputHandler(_parent);
+        
+        public UserProfile ShowPlayerSelectDialog()
+        {
+            UserId selected = UserId.Null;
+            byte[] defaultGuestImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg");
+            UserProfile guest = new UserProfile(new UserId("00000000000000000000000000000080"), "Guest", defaultGuestImage);
+    
+            ManualResetEvent dialogCloseEvent = new(false);
+    
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                ObservableCollection<BaseModel> profiles = [];
+                NavigationDialogHost nav = new();
+                
+                _parent.AccountManager.GetAllUsers()
+                    .OrderBy(x => x.Name)
+                    .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
+                
+                profiles.Add(new Models.UserProfile(guest, nav));
+                UserSelectorDialogViewModel viewModel = new()
+                {
+                    Profiles = profiles, 
+                    SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
+                };
+                UserSelectorDialog content = new(viewModel);
+                (selected, _) = await UserSelectorDialog.ShowInputDialog(content);
+        
+                dialogCloseEvent.Set();
+            });
+    
+            dialogCloseEvent.WaitOne();
+            
+            UserProfile profile = _parent.AccountManager.LastOpenedUser;
+            if (selected == guest.UserId)
+            {
+                profile = guest;
+            }
+            else if (selected == UserId.Null)
+            {
+                profile = null;
+            }
+            else
+            {
+                foreach (UserProfile p in _parent.AccountManager.GetAllUsers())
+                {
+                    if (p.UserId == selected)
+                    {
+                        profile = p;
+                        break;
+                    }
+                }
+            }
+            return profile;
+        }
    }
 }
--- a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml
+++ b/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml
@@ -0,0 +1,121 @@
+<UserControl
+    x:Class="Ryujinx.Ava.UI.Applet.UserSelectorDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    d:DesignHeight="450"
+    MinWidth="500"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
+    Focusable="True"
+    x:DataType="viewModels:UserSelectorDialogViewModel">
+    
+    <UserControl.Resources>
+        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
+    </UserControl.Resources>
+    
+    <Design.DataContext>
+        <viewModels:UserSelectorDialogViewModel />
+    </Design.DataContext>
+    
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
+        <Border
+            CornerRadius="5"
+            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
+            BorderThickness="1">
+            
+            <ListBox
+                MaxHeight="300"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                ItemsSource="{Binding Profiles}"
+                SelectionChanged="ProfilesList_SelectionChanged">
+                
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="Margin" Value="5 5 0 5" />
+                        <Setter Property="CornerRadius" Value="5" />
+                    </Style>
+                    <Style Selector="Rectangle#SelectionIndicator">
+                        <Setter Property="Opacity" Value="0" />
+                    </Style>
+                </ListBox.Styles>
+                
+                <ListBox.DataTemplates>
+                    <DataTemplate
+                        DataType="models:UserProfile">
+                        <Grid
+                            PointerEntered="Grid_PointerEntered"
+                            PointerExited="Grid_OnPointerExited">
+                            <Border
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                ClipToBounds="True"
+                                CornerRadius="5"
+                                Background="{Binding BackgroundColor}">
+                                <StackPanel
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch">
+                                    <Image
+                                        Width="96"
+                                        Height="96"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Top"
+                                        Source="{Binding Image, Converter={StaticResource ByteImage}}" />
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        MaxWidth="90"
+                                        Text="{Binding Name}"
+                                        TextAlignment="Center"
+                                        TextWrapping="Wrap"
+                                        TextTrimming="CharacterEllipsis"
+                                        MaxLines="2"
+                                        Margin="5" />
+                                </StackPanel>
+                            </Border>
+                        </Grid>
+                    </DataTemplate>
+                    <DataTemplate
+                        DataType="viewModels:BaseModel">
+                        <Panel
+                            Height="118"
+                            Width="96">
+                            <Panel.Styles>
+                                <Style Selector="Panel">
+                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                                </Style>
+                            </Panel.Styles>
+                        </Panel>
+                    </DataTemplate>
+                </ListBox.DataTemplates>
+            </ListBox>
+        </Border>
+        
+        <StackPanel
+            Grid.Row="1"
+            Margin="0 24 0 0"
+            HorizontalAlignment="Left"
+            Orientation="Horizontal"
+            Spacing="10">
+        </StackPanel>
+    </Grid>
+</UserControl>
--- a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs
+++ b/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs
@@ -0,0 +1,123 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
+using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
+
+namespace Ryujinx.Ava.UI.Applet
+{
+    public partial class UserSelectorDialog : UserControl, INotifyPropertyChanged
+    {
+        public UserSelectorDialogViewModel ViewModel { get; set; }
+
+        public UserSelectorDialog(UserSelectorDialogViewModel viewModel)
+        {
+            InitializeComponent();
+            ViewModel = viewModel;
+            DataContext = ViewModel;
+        }
+        
+        private void Grid_PointerEntered(object sender, PointerEventArgs e)
+        {
+            if (sender is Grid { DataContext: UserProfile profile })
+            {
+                profile.IsPointerOver = true;
+            }
+        }
+
+        private void Grid_OnPointerExited(object sender, PointerEventArgs e)
+        {
+            if (sender is Grid { DataContext: UserProfile profile })
+            {
+                profile.IsPointerOver = false;
+            }
+        }
+
+        private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is ListBox listBox)
+            {
+                int selectedIndex = listBox.SelectedIndex;
+
+                if (selectedIndex >= 0 && selectedIndex < ViewModel.Profiles.Count)
+                {
+                    if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
+                    {
+                        ViewModel.SelectedUserId = userProfile.UserId;
+                        Logger.Info?.Print(LogClass.UI, $"Selected user: {userProfile.UserId}");
+
+                        ObservableCollection<BaseModel> newProfiles = [];
+
+                        foreach (var item in ViewModel.Profiles)
+                        {
+                            if (item is UserProfile originalItem)
+                            {
+                                var profile = new UserProfileSft(originalItem.UserId, originalItem.Name, originalItem.Image);
+                                
+                                if (profile.UserId == ViewModel.SelectedUserId)
+                                {
+                                    profile.AccountState = AccountState.Open;
+                                }
+
+                                newProfiles.Add(new UserProfile(profile, new NavigationDialogHost()));
+                            }
+                        }
+
+                        ViewModel.Profiles = newProfiles;
+                    }
+                }
+            }
+        }
+
+        public static async Task<(UserId Id, bool Result)> ShowInputDialog(UserSelectorDialog content)
+        {
+            ContentDialog contentDialog = new()
+            {
+                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
+                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
+                Content = content,
+                Padding = new Thickness(0)
+            };
+
+            UserId result = UserId.Null;
+            bool input = false;
+
+            void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs)
+            {
+                if (eventArgs.Result == ContentDialogResult.Primary)
+                {
+                    if (contentDialog.Content is UserSelectorDialog view)
+                    {
+                        result = view.ViewModel.SelectedUserId;
+                        input = true;
+                    }
+                }
+                else
+                {
+                    result = UserId.Null;
+                    input = false;
+                }
+            }
+
+            contentDialog.Closed += Handler;
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
+
+            return (result, input);
+        }
+    }
+}
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -106,6 +106,10 @@
            Click="ExtractApplicationRomFs_Click"
            Header="{ext:Locale GameListContextMenuExtractDataRomFS}"
            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataRomFSToolTip}" />
+        <MenuItem
+            Click="ExtractAocRomFs_Click"
+            Header="{ext:Locale GameListContextMenuExtractDataAocRomFS}"
+            ToolTip.Tip="{ext:Locale GameListContextMenuExtractDataAocRomFSToolTip}" />
        <MenuItem
            Click="ExtractApplicationLogo_Click"
            Header="{ext:Locale GameListContextMenuExtractDataLogo}"
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -3,10 +3,13 @@ using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
+using LibHac;
 using LibHac.Fs;
 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.UI.Windows;
@@ -14,6 +17,7 @@ using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS;
 using SkiaSharp;
 using System;
@@ -279,6 +283,22 @@ namespace Ryujinx.Ava.UI.Controls
                    viewModel.SelectedApplication.Path,
                    viewModel.SelectedApplication.Name);
        }
+        
+        public async void ExtractAocRomFs_Click(object sender, RoutedEventArgs args)
+        {
+            if (sender is not MenuItem { DataContext: MainWindowViewModel { SelectedApplication: not null } viewModel })
+                return;
+
+            DownloadableContentModel selectedDlc = await DlcSelectView.Show(viewModel.SelectedApplication.IdBase, viewModel.ApplicationLibrary);
+            
+            if (selectedDlc is not null)
+            {
+                await ApplicationHelper.ExtractAoc(
+                    viewModel.StorageProvider,
+                    selectedDlc.ContainerPath,
+                    selectedDlc.FileName);
+            }
+        }

        public async void ExtractApplicationLogo_Click(object sender, RoutedEventArgs args)
        {
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -2,11 +2,10 @@
    x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    d:DesignHeight="450"
    d:DesignWidth="800"
    Focusable="True"
@@ -133,12 +132,13 @@
                                    Spacing="5">
                                    <TextBlock
                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding TimePlayedString}"
+                                        Text="{Binding LastPlayedString}"
                                        TextAlignment="End"
                                        TextWrapping="Wrap" />
                                    <TextBlock
                                        HorizontalAlignment="Stretch"
-                                        Text="{Binding LastPlayedString}"
+                                        Text="{Binding TimePlayedString}"
+                                        IsVisible="{Binding HasPlayedPreviously}"
                                        TextAlignment="End"
                                        TextWrapping="Wrap" />
                                    <TextBlock
--- a/src/Ryujinx/UI/Controls/DlcSelectView.axaml
+++ b/src/Ryujinx/UI/Controls/DlcSelectView.axaml
@@ -0,0 +1,67 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
+             xmlns:ext="using:Ryujinx.Ava.Common.Markup"
+             xmlns:models="using:Ryujinx.Ava.Common.Models"
+             xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ryujinx.Ava.UI.Controls.DlcSelectView"
+             x:DataType="viewModels:DlcSelectViewModel">
+    <Grid RowDefinitions="*,Auto,*">
+        <TextBlock
+            Classes="h1"
+            Margin="5, -5, 0, 15"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            TextWrapping="Wrap"
+            Text="{ext:Locale ExtractAocListHeader}" />
+        <ScrollViewer Grid.Row="2">
+            <ListBox
+                AutoScrollToSelectedItem="False"
+                SelectionMode="Single"
+                Background="Transparent"
+                SelectedItem="{Binding SelectedDlc}"
+                ItemsSource="{Binding Dlcs}">
+                <ListBox.DataTemplates>
+                    <DataTemplate
+                        DataType="models:DownloadableContentModel">
+                        <Panel Margin="10" Background="Transparent">
+                            <Grid ColumnDefinitions="*,Auto">
+                                <Grid
+                                    Grid.Column="0" ColumnDefinitions="*,Auto">
+                                    <TextBlock
+                                        Grid.Column="0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        MaxLines="2"
+                                        TextWrapping="Wrap"
+                                        TextTrimming="CharacterEllipsis">
+                                        <TextBlock.Text>
+                                            <MultiBinding Converter="{x:Static helpers:DownloadableContentLabelConverter.Instance}">
+                                                <Binding Path="FileName" />
+                                                <Binding Path="IsBundled" />
+                                            </MultiBinding>
+                                        </TextBlock.Text>
+                                    </TextBlock>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Margin="10, 0, 0, 0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding TitleIdStr}" />
+                                </Grid>
+                            </Grid>
+                        </Panel>
+                    </DataTemplate>
+                </ListBox.DataTemplates>
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="Background" Value="Transparent" />
+                    </Style>
+                </ListBox.Styles>
+            </ListBox>
+        </ScrollViewer>
+    </Grid>
+</UserControl>
--- a/src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs
+++ b/src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs
@@ -0,0 +1,51 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+using FluentAvalonia.UI.Controls;
+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 System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Controls
+{
+    public partial class DlcSelectView : UserControl
+    {
+        public DlcSelectView()
+        {
+            InitializeComponent();
+        }
+
+#nullable enable
+        public static async Task<DownloadableContentModel?> Show(ulong selectedTitleId, ApplicationLibrary appLibrary)
+#nullable disable
+        {
+            DlcSelectViewModel viewModel = new(selectedTitleId, appLibrary);
+
+            ContentDialog contentDialog = new()
+            {
+                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = string.Empty,
+                Content = new DlcSelectView { DataContext = viewModel }
+            };
+
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
+
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
+                Avalonia.Layout.HorizontalAlignment.Right));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
+
+            return viewModel.SelectedDlc;
+        }
+    }
+}
--- a/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs
+++ b/src/Ryujinx/UI/Controls/NavigationDialogHost.axaml.cs
@@ -69,7 +69,7 @@ namespace Ryujinx.Ava.UI.Controls
            VirtualFileSystem ownerVirtualFileSystem,
            HorizonClient ownerHorizonClient)
        {
-            var content = new NavigationDialogHost(ownerAccountManager, ownerContentManager, ownerVirtualFileSystem, ownerHorizonClient);
+            NavigationDialogHost content = new(ownerAccountManager, ownerContentManager, ownerVirtualFileSystem, ownerHorizonClient);
            ContentDialog contentDialog = new()
            {
                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
@@ -7,6 +7,7 @@
    Title="Ryujinx - Waiting"
    SizeToContent="WidthAndHeight"
    WindowStartupLocation="CenterOwner"
+    CanResize="False"
    mc:Ignorable="d"
    Focusable="True">
    <Grid
--- a/src/Ryujinx/UI/Helpers/Commands.cs
+++ b/src/Ryujinx/UI/Helpers/Commands.cs
@@ -0,0 +1,48 @@
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Threading.Tasks;
+
+namespace Ryujinx.Ava.UI.Helpers
+{
+#nullable enable
+    public static class Commands
+    {
+        public static RelayCommand Create(Action action)
+            => new(action);
+        public static RelayCommand CreateConditional(Action action, Func<bool> canExecute)
+            => new(action, canExecute);
+        
+        public static RelayCommand<T> Create<T>(Action<T?> action)
+            => new(action);
+        public static RelayCommand<T> CreateConditional<T>(Action<T?> action, Predicate<T?> canExecute)
+            => new(action, canExecute);
+
+        public static AsyncRelayCommand Create(Func<Task> action)
+            => new(action, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand CreateConcurrent(Func<Task> action)
+            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand CreateSilentFail(Func<Task> action)
+            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+        
+        public static AsyncRelayCommand<T> Create<T>(Func<T?, Task> action)
+            => new(action, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand<T> CreateConcurrent<T>(Func<T?, Task> action)
+            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand<T> CreateSilentFail<T>(Func<T?, Task> action)
+            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+
+        public static AsyncRelayCommand CreateConditional(Func<Task> action, Func<bool> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand CreateConcurrentConditional(Func<Task> action, Func<bool> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand CreateSilentFailConditional(Func<Task> action, Func<bool> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+        
+        public static AsyncRelayCommand<T> CreateConditional<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.None);
+        public static AsyncRelayCommand<T> CreateConcurrentConditional<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
+        public static AsyncRelayCommand<T> CreateSilentFailConditional<T>(Func<T?, Task> action, Predicate<T?> canExecute)
+            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
+    }
+}
--- a/src/Ryujinx/UI/Helpers/Converters/BitmapArrayValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/BitmapArrayValueConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/DownloadableContentLabelConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/DownloadableContentLabelConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/KeyValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/KeyValueConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/MultiplayerInfoConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/PlayabilityStatusConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/PlayabilityStatusConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/TimeZoneConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/TimeZoneConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/TitleUpdateLabelConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/TitleUpdateLabelConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileSpaceSavingsConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileSpaceSavingsConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusConverter.cs
--- a/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusDetailConverter.cs
+++ b/src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusDetailConverter.cs
--- a/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/HotkeyConfig.cs
@@ -1,152 +1,53 @@
+using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;

 namespace Ryujinx.Ava.UI.Models.Input
 {
-    public class HotkeyConfig : BaseModel
+    public partial class HotkeyConfig : BaseModel
    {
-        private Key _toggleVSyncMode;
-        public Key ToggleVSyncMode
-        {
-            get => _toggleVSyncMode;
-            set
-            {
-                _toggleVSyncMode = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _toggleVSyncMode;

-        private Key _screenshot;
-        public Key Screenshot
-        {
-            get => _screenshot;
-            set
-            {
-                _screenshot = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _screenshot;

-        private Key _showUI;
-        public Key ShowUI
-        {
-            get => _showUI;
-            set
-            {
-                _showUI = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _showUI;

-        private Key _pause;
-        public Key Pause
-        {
-            get => _pause;
-            set
-            {
-                _pause = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _pause;

-        private Key _toggleMute;
-        public Key ToggleMute
-        {
-            get => _toggleMute;
-            set
-            {
-                _toggleMute = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _toggleMute;

-        private Key _resScaleUp;
-        public Key ResScaleUp
-        {
-            get => _resScaleUp;
-            set
-            {
-                _resScaleUp = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _resScaleUp;

-        private Key _resScaleDown;
-        public Key ResScaleDown
-        {
-            get => _resScaleDown;
-            set
-            {
-                _resScaleDown = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _resScaleDown;

-        private Key _volumeUp;
-        public Key VolumeUp
-        {
-            get => _volumeUp;
-            set
-            {
-                _volumeUp = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _volumeUp;

-        private Key _volumeDown;
-        public Key VolumeDown
-        {
-            get => _volumeDown;
-            set
-            {
-                _volumeDown = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _volumeDown;

-        private Key _customVSyncIntervalIncrement;
-        public Key CustomVSyncIntervalIncrement
-        {
-            get => _customVSyncIntervalIncrement;
-            set
-            {
-                _customVSyncIntervalIncrement = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _customVSyncIntervalIncrement;

-        private Key _customVSyncIntervalDecrement;
-        public Key CustomVSyncIntervalDecrement
-        {
-            get => _customVSyncIntervalDecrement;
-            set
-            {
-                _customVSyncIntervalDecrement = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private Key _customVSyncIntervalDecrement;

        public HotkeyConfig(KeyboardHotkeys config)
        {
-            if (config != null)
-            {
-                ToggleVSyncMode = config.ToggleVSyncMode;
-                Screenshot = config.Screenshot;
-                ShowUI = config.ShowUI;
-                Pause = config.Pause;
-                ToggleMute = config.ToggleMute;
-                ResScaleUp = config.ResScaleUp;
-                ResScaleDown = config.ResScaleDown;
-                VolumeUp = config.VolumeUp;
-                VolumeDown = config.VolumeDown;
-                CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
-                CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
-            }
+            if (config == null)
+                return;
+
+            ToggleVSyncMode = config.ToggleVSyncMode;
+            Screenshot = config.Screenshot;
+            ShowUI = config.ShowUI;
+            Pause = config.Pause;
+            ToggleMute = config.ToggleMute;
+            ResScaleUp = config.ResScaleUp;
+            ResScaleDown = config.ResScaleDown;
+            VolumeUp = config.VolumeUp;
+            VolumeDown = config.VolumeDown;
+            CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
+            CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
        }

-        public KeyboardHotkeys GetConfig()
-        {
-            var config = new KeyboardHotkeys
+        public KeyboardHotkeys GetConfig() =>
+            new()
            {
                ToggleVSyncMode = ToggleVSyncMode,
                Screenshot = Screenshot,
@@ -160,8 +61,5 @@ namespace Ryujinx.Ava.UI.Models.Input
                CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
            };
-
-            return config;
-        }
    }
 }
--- a/src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs
+++ b/src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs
@@ -22,5 +22,22 @@ namespace Ryujinx.Ava.UI.Models
            FifoStatus = fifoStatus;
            ShaderCount = shaderCount;
        }
+
+
+        public override bool Equals(object obj)
+        {
+            if (obj is not StatusUpdatedEventArgs suea) return false;
+            return
+                VSyncMode == suea.VSyncMode &&
+                VolumeStatus == suea.VolumeStatus &&
+                DockedMode == suea.DockedMode &&
+                AspectRatio == suea.AspectRatio &&
+                GameStatus == suea.GameStatus &&
+                FifoStatus == suea.FifoStatus &&
+                ShaderCount == suea.ShaderCount;
+        }
+
+        public override int GetHashCode() 
+            => HashCode.Combine(VSyncMode, VolumeStatus, AspectRatio, DockedMode, FifoStatus, GameStatus, ShaderCount);
    }
 }
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
        }

-        private void ThemeManager_ThemeChanged(object sender, EventArgs e)
+        private void ThemeManager_ThemeChanged()
        {
            Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value));
        }
--- a/src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/DlcSelectViewModel.cs
@@ -0,0 +1,25 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Ryujinx.Ava.Common.Models;
+using Ryujinx.Ava.Utilities.AppLibrary;
+using System.Linq;
+
+namespace Ryujinx.Ava.UI.ViewModels
+{
+    public partial class DlcSelectViewModel : BaseModel
+    {
+        [ObservableProperty] private DownloadableContentModel[] _dlcs;
+        #nullable enable
+        [ObservableProperty] private DownloadableContentModel? _selectedDlc;
+        #nullable disable
+        
+        public DlcSelectViewModel(ulong titleId, ApplicationLibrary appLibrary)
+        {
+            _dlcs = appLibrary.DownloadableContents.Items
+                .Where(x => x.Dlc.TitleIdBase == titleId)
+                .Select(x => x.Dlc)
+                .OrderBy(it => it.IsBundled ? 0 : 1)
+                .ThenBy(it => it.TitleId)
+                .ToArray();
+        }
+    }
+}
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -1,21 +1,13 @@
 using Avalonia.Svg.Skia;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;

 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public class ControllerInputViewModel : BaseModel
+    public partial class ControllerInputViewModel : BaseModel
    {
-        private GamepadInputConfig _config;
-        public GamepadInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private GamepadInputConfig _config;

        private bool _isLeft;
        public bool IsLeft
@@ -43,16 +35,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        public bool HasSides => IsLeft ^ IsRight;

-        private SvgImage _image;
-        public SvgImage Image
-        {
-            get => _image;
-            set
-            {
-                _image = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private SvgImage _image;

        public readonly InputViewModel ParentModel;

--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -1,9 +1,8 @@
-using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Svg.Skia;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
@@ -32,7 +31,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;

 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public class InputViewModel : BaseModel, IDisposable
+    public partial class InputViewModel : BaseModel, IDisposable
    {
        private const string Disabled = "disabled";
        private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon.svg";
@@ -48,8 +47,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        private int _controller;
        private string _controllerImage;
        private int _device;
-        private object _configViewModel;
-        private string _profileName;
+        [ObservableProperty] private object _configViewModel;
+        [ObservableProperty] private string _profileName;
        private bool _isLoaded;

        private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -73,17 +72,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public bool IsModified { get; set; }
        public event Action NotifyChangesEvent;

-        public object ConfigViewModel
-        {
-            get => _configViewModel;
-            set
-            {
-                _configViewModel = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public PlayerIndex PlayerIdChoose
        {
            get => _playerIdChoose;
@@ -200,16 +188,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            }
        }

-        public string ProfileName
-        {
-            get => _profileName; set
-            {
-                _profileName = value;
-
-                OnPropertyChanged();
-            }
-        }
-
        public int Device
        {
            get => _device;
--- a/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
@@ -1,20 +1,12 @@
 using Avalonia.Svg.Skia;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;

 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public class KeyboardInputViewModel : BaseModel
+    public partial class KeyboardInputViewModel : BaseModel
    {
-        private KeyboardInputConfig _config;
-        public KeyboardInputConfig Config
-        {
-            get => _config;
-            set
-            {
-                _config = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private KeyboardInputConfig _config;

        private bool _isLeft;
        public bool IsLeft
@@ -42,16 +34,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

        public bool HasSides => IsLeft ^ IsRight;

-        private SvgImage _image;
-        public SvgImage Image
-        {
-            get => _image;
-            set
-            {
-                _image = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private SvgImage _image;

        public readonly InputViewModel ParentModel;

--- a/src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs
@@ -1,93 +1,23 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public class MotionInputViewModel : BaseModel
+    public partial class MotionInputViewModel : BaseModel
    {
-        private int _slot;
-        public int Slot
-        {
-            get => _slot;
-            set
-            {
-                _slot = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private int _slot;

-        private int _altSlot;
-        public int AltSlot
-        {
-            get => _altSlot;
-            set
-            {
-                _altSlot = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private int _altSlot;

-        private string _dsuServerHost;
-        public string DsuServerHost
-        {
-            get => _dsuServerHost;
-            set
-            {
-                _dsuServerHost = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private string _dsuServerHost;

-        private int _dsuServerPort;
-        public int DsuServerPort
-        {
-            get => _dsuServerPort;
-            set
-            {
-                _dsuServerPort = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private int _dsuServerPort;

-        private bool _mirrorInput;
-        public bool MirrorInput
-        {
-            get => _mirrorInput;
-            set
-            {
-                _mirrorInput = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private bool _mirrorInput;

-        private int _sensitivity;
-        public int Sensitivity
-        {
-            get => _sensitivity;
-            set
-            {
-                _sensitivity = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private int _sensitivity;

-        private double _gryoDeadzone;
-        public double GyroDeadzone
-        {
-            get => _gryoDeadzone;
-            set
-            {
-                _gryoDeadzone = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private double _gyroDeadzone;

-        private bool _enableCemuHookMotion;
-        public bool EnableCemuHookMotion
-        {
-            get => _enableCemuHookMotion;
-            set
-            {
-                _enableCemuHookMotion = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private bool _enableCemuHookMotion;
    }
 }
--- a/src/Ryujinx/UI/ViewModels/Input/RumbleInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/RumbleInputViewModel.cs
@@ -1,27 +1,11 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public class RumbleInputViewModel : BaseModel
+    public partial class RumbleInputViewModel : BaseModel
    {
-        private float _strongRumble;
-        public float StrongRumble
-        {
-            get => _strongRumble;
-            set
-            {
-                _strongRumble = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private float _strongRumble;

-        private float _weakRumble;
-        public float WeakRumble
-        {
-            get => _weakRumble;
-            set
-            {
-                _weakRumble = value;
-                OnPropertyChanged();
-            }
-        }
+        [ObservableProperty] private float _weakRumble;
    }
 }
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -38,7 +38,6 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input.HLE;
-using Silk.NET.Vulkan;
 using SkiaSharp;
 using System;
 using System.Collections.Generic;
@@ -489,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;
@@ -625,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,
                };
            }
@@ -695,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;
@@ -727,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
            };
@@ -1196,6 +1211,11 @@ namespace Ryujinx.Ava.UI.ViewModels
            StartGamesInFullscreen = !StartGamesInFullscreen;
        }

+        public void ToggleStartGamesWithoutUI()
+        {
+            StartGamesWithoutUI = !StartGamesWithoutUI;
+        }
+
        public void ToggleShowConsole()
        {
            ShowConsole = !ShowConsole;
@@ -1642,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);
@@ -1663,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
                {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sunshineinabox	c1231da79f	Merge `48f9ada59b` into `fe9d8d05bd`	2025-01-22 09:07:49 +09:00
Evan Husted	fe9d8d05bd	UI: Fixed the Amiibo keybind only working when the UI had been updated.	2025-01-21 18:00:51 -06:00
Evan Husted	880a8ae748	misc: chore: Remove duplicated styling blocks in MainMenuBarView in favor of a reusable Avalonia Style.	2025-01-21 17:50:55 -06:00
asfasagag	11531dacb6	UI: Option to automatically Hide UI when game launches (#462 ) Quality of life feature Similar in function to the "Start Games in Fullscreen" toggle For users who want to run games in windowed/non-fullscreen mode with menu UI hidden, this eliminates the need to always click "Hide UI"	2025-01-21 17:36:51 -06:00
Evan Husted	3974739ed3	More descriptive classification	2025-01-21 17:35:22 -06:00
Evan Husted	440a3447fb	docs: compat: Update South Park: The Fractured but Whole: playable -> boots	2025-01-21 17:10:54 -06:00
Evan Husted	65374ed6cb	UI: [ci skip] clarify dirty hacks subtext	2025-01-21 16:57:05 -06:00
Evan Husted	789d6ab959	misc: chore: Improve autoloading DLC/updates logging, deliberately switch to Vulkan if Metal was somehow chosen on a non-mac system, add logger lines in the updater, cleanup enabled logs printing	2025-01-21 14:59:08 -06:00
Evan Husted	182db31343	metal: Added Persona 4 Arena Ultimax to Auto	2025-01-21 14:07:05 -06:00
Evan Husted	ea296b134d	Use specific Ubuntu version in build script	2025-01-21 14:05:49 -06:00
Evan Husted	bf584442b2	misc: chore: remove needless call to string.Format	2025-01-21 14:05:49 -06:00
Otozinclus	cb7c294dbf	Add more games to metal game list (#558 ) Link's awakening I have played through most of the game with 0 issues. In LEGO City undercover I have played multiple missions and explored the map, I was unable to spot any issue. Except shadows flickering sometimes, but that seems to happen on Vulkan and the PC version as well and is propably normal. Bayonetta seems to work flawless so far. In Fast RMX, some tracks have flickering issues, like the second track of the first cup. This happens on Vulkan as well. - Mario Bros. Wonder has following issues: Overall issues: - Sometimes there is short white flickering/artifacts, but they happen on Vulkan as well. Metal specific issue: - In 2 underwater levels, a specific location causes a FPS drop not present on Vulkan. But this is very minor and on all current M chips you get on average better FPS with Metal (On my M3, there are occasional drops that are worse with Vulkan), reducing stutter quite noticeably, which is why I think it should get added to auto regardless. - Isaac mentioned there is a issue in level 2, where the flowers singing desync somehow. However, I was after lot of testing unable to replicate this issue at all. More testing could be useful. Fix: Fixed 2 typos in the comments	2025-01-21 14:05:41 -06:00
Daenorth	eaf1e7efd2	Cleanup in TitleIDs.cs (#546 ) Just a little cleanup in TitleID.cs, adding a franchise title to most franchises + sorting in alphabetical on all games.	2025-01-21 11:20:43 -06:00
Judas Drekonym	471e7ed2e4	Add TitleID sort method (#553 ) Adds an additional application list sorting method for the TitleID. A bit of a niche choice for sorting but I think the TID is a relevant enough piece of metadata that it should be there. (And I personally would be using it) - Using existing TitleId constant in ApplicationSort, implying this was meant to be in the sorting options at some point? - Reuses the "DlcManagerTableHeadingTitleIdLabel" locale for fulfilling the need already, might be better to make a unique one for this in the long run but this codebase is new to me so I wanted to make the changes as unobtrusive as possible - Using app.Id for the comparer seems to work fine, not sure if using something else like IdString would be better?	2025-01-21 11:06:40 -06:00
Matt Zinkevicius	ad3e80b383	Log .NET runtime version (#552 ) I was looking into a crash, and found out it was an issue that was fixed in .NET 9.0.1. Since Ryujinx embeds the runtime into the executable, it not obvious which runtime a build uses. This logs the .NET runtime version immediately after the build version.	2025-01-20 19:19:19 -06:00
Evan Husted	ed64a63094	UI: Visually merge "Actions" and "Tools" menu bar items into Actions The contents of the menu item are dependent on whether you're in a game. No functionality has been removed.	2025-01-20 16:56:05 -06:00
Evan Husted	8df7ba2d56	i18n: Norwegian DLC RomFS dumping translation	2025-01-20 15:55:37 -06:00
LotP1	e743d78115	Add/fix service reported info (#551 ) fixes the GetConfig service call, which now returns success correctly adds support for getting the device serial number (which is fake and reports as "RYU00000000000")	2025-01-20 14:59:54 -06:00
Evan Husted	04ba762710	UI: Move DLC RomFS dumping under normal RomFS dumping. Also removed it from DLC manager.	2025-01-20 14:30:28 -06:00
Evan Husted	f42b2ed59d	misc: chore: more correct last used user checking	2025-01-20 13:33:59 -06:00
Evan Husted	d135385cab	Leftovers, oops	2025-01-20 09:32:38 -06:00
Evan Husted	b360f4e721	UI: Dump DLC RomFS. You can access this in the Manage DLC screen, it's the new button on each DLC line. Closes #548	2025-01-20 09:28:58 -06:00
Daenorth	a1c0c70ec2	Added missing TitleIDs (#545 ) Added the remaining missing TitleIDs in the compat.csv list. Excluding Homebrew apps.	2025-01-19 21:15:46 -06:00
Daenorth	290ac405ac	Updated Ukrainian translation by Rondo (#543 ) Co-authored-by: rrondo <46533574+rrondo@users.noreply.github.com>	2025-01-19 21:00:40 -06:00
Evan Husted	bbd64fd5f0	misc: chore: Cleanup AppletMetadata usage	2025-01-19 19:40:49 -06:00
Evan Husted	09446fd80e	[ci skip] infra: Update copyright year in shortcut plist	2025-01-19 18:57:05 -06:00
Evan Husted	4f014a89cf	docs: compat: Donkey Kong Country Returns HD	2025-01-19 18:28:43 -06:00
Evan Husted	6482e566ab	UI: Compat: Unload compatibility entries when the window closes.	2025-01-19 17:41:50 -06:00
Evan Husted	7fcd9b792e	UI: Compat: Update owned game title IDs when ApplicationLibrary app count updates	2025-01-19 17:41:31 -06:00
Evan Husted	e676fd8b17	UI: misc: simplify Intel Mac warning logic	2025-01-19 14:42:15 -06:00
Evan Husted	dd16e3cee1	misc: chore: very small cleanup in AvaHostUIHandler	2025-01-19 13:18:40 -06:00
Evan Husted	31e5f74e05	UI: misc: Replace spaces in Title with newlines when using custom title bar (since the Title is in an Avalonia tooltip)	2025-01-19 13:05:20 -06:00
Evan Husted	f2f099bddb	remove Async suffixes; they're factory methods not actual async methods.	2025-01-19 12:46:32 -06:00
Evan Husted	2616dc57fb	misc: chore: RelayCommand helper	2025-01-19 12:44:07 -06:00
Evan Husted	0cdf7cfe21	UI: Open cheat manager in catch-all try	2025-01-18 22:48:06 -06:00
Evan Husted	2ecf999569	misc: chore: change ThemeManager ThemeChanged to a basic Action since both arguments are unused	2025-01-18 22:48:06 -06:00
Daenorth	b612fc5155	Updated TitleIDs (#541 ) Added more games to the RPC list. Now alphabetical.	2025-01-18 22:19:28 -06:00
Evan Husted	25eb545409	Update bug_report.yml	2025-01-18 20:55:28 -06:00
Jacob	52269964b6	Add the player select applet. (#537 ) This introduces the somewhat completed version of the Player Select Applet, allowing users to select either a user or a guest from the UI. Note: Selecting the guest more then once currently does not work. closes https://github.com/Ryubing/Ryujinx/issues/532	2025-01-18 20:40:33 -06:00
Evan Husted	ccdddac8fc	Fix compile warnings	2025-01-18 19:34:31 -06:00
Daenorth	1bc30bf3ba	Update locales.json (#538 ) Added a missing translation line	2025-01-18 18:40:51 -06:00
Evan Husted	4868fface8	UI: Intel Mac warning Upon launch, shows a warning about using an Intel Mac. This will only show once every boot. You can only turn it off by getting a better system.	2025-01-18 15:33:05 -06:00
Evan Husted	6fca4492d0	misc: chore: Remove status update event stuff in Headless	2025-01-18 15:15:08 -06:00
Evan Husted	ade2f256e0	misc: chore: remove duplicate graphics debug levels in headless windows	2025-01-18 11:19:38 -06:00
Evan Husted	580b150c9a	Revert "infra: Conditionally compile Metal & OpenGL depending on if the target RuntimeIdentifier is mac" This reverts commit `2f93a0f706`.	2025-01-18 10:57:02 -06:00
Evan Husted	e6bad52945	Revert "Only selectively compile Metal & fix some compilation issues" This reverts commit `beda3206e0`.	2025-01-18 10:56:58 -06:00
Evan Husted	beda3206e0	Only selectively compile Metal & fix some compilation issues	2025-01-18 10:52:32 -06:00
Evan Husted	2f93a0f706	infra: Conditionally compile Metal & OpenGL depending on if the target RuntimeIdentifier is mac	2025-01-18 10:38:29 -06:00
Evan Husted	80f44d9547	misc: chore: small cleanup	2025-01-18 10:33:57 -06:00
Evan Husted	b08e5db6d8	Headless: Dispose of inputmanager in a catch-all try	2025-01-18 10:30:19 -06:00
Evan Husted	6a291d4116	Headless: Use main UI logo for window icon instead of separate bmp	2025-01-18 10:26:12 -06:00
Evan Husted	6fc827fe67	headless: collapse headless window definition into a "Windows" folder, change GetWindowFlags to an abstract property.	2025-01-18 10:15:24 -06:00
Daniel Nylander	6cd4866d76	Updated sv_SE in locales.json (#513 )	2025-01-17 18:04:18 -06:00
WilliamWsyHK	4d7ca5c0f0	Update Chinese translations (#375 )	2025-01-17 17:35:34 -06:00
GabCoolGuy	a375faecc1	UI: Fix UpdateWaitWindow.axaml windows being too big on windows (#314 )	2025-01-17 14:14:19 -06:00
Evan Husted	1728b0f20c	WWE 2K18 is not playable.	2025-01-17 11:37:08 -06:00
LotP1	5aa071c59b	remove notice for unusual core counts (#531 )	2025-01-17 05:50:42 -06:00
Daenorth	1018c9db8b	Update Norwegian Translation (#503 ) Norwegian translation updated with the Compatibility list addition	2025-01-16 10:02:33 -06:00
Evan Husted	01ccd18726	UI: Meant to use that method in another place [ci-skip]	2025-01-16 09:52:35 -06:00
Evan Husted	abfbc6f4bc	UI: Prevent desynced RPC when toggling it off/on while in-game	2025-01-16 09:52:01 -06:00
Francesco Saltori	6a4bc02d7a	Update Italian translation (#489 )	2025-01-16 06:38:36 -06:00
Hack茶ん	814c0526d2	Korean translations for compat list (#502 )	2025-01-16 04:57:32 -06:00
Evan Husted	a5a4ef38e6	HLE: Stub IHidServer SetGestureOutputRanges (#524 ) Lets "Donkey Kong Country Returns HD" get into main gameplay.	2025-01-16 02:39:39 -06:00
Evan Husted	c17e3bfcdf	genuinely dont know how that was still there, i thought i got rid of UI.Common	2025-01-15 03:01:17 -06:00
Evan Husted	017f46f318	HLE: misc: throw a more descriptive error when the loaded processes doesn't contain _latestPid (likely missing FW)	2025-01-15 03:01:17 -06:00
Keaton	fd4d801bfd	Various NuGet package updates (#203 ) Updates the following packages: nuget: bump the avalonia group with 7 updates * Bump Avalonia, Avalonia.Controls.DataGrid, Avalonia.Desktop, Avalonia.Diagnostics, and Avalonia.Markup.Xaml.Loader from 11.0.10 to 11.0.13 * Bump Avalonia.Svg and Avalonia.Svg.Skia from 11.0.0.18 to 11.0.0.19 nuget: bump non-avalonia packages * Bump Concentus from 2.2.0 to 2.2.2 * Bump Microsoft.IdentityModel.JsonWebTokens from 8.1.2 to 8.3.0 * Bump Silk.NET.Vulkan group with 3 updates (2.21.0 to 2.22.0) * Bump SkiaSharp group with 2 updates (2.88.7 to 2.88.9)	2025-01-13 11:15:05 -06:00
GabCoolGuy	f1dee50275	infra: Update to LLVM 17 (#519 ) This fixes macos builds not building correctly because of a missing LLVM 14 package.	2025-01-12 14:57:57 -06:00
shinyoyo	c2ae49eb47	Add some missing Simplified Chinese translations (#515 )	2025-01-12 12:33:27 -06:00
WilliamWsyHK	47c71966d0	Add compat of Xenoblade 2 JP edition same as global edition (#517 )	2025-01-12 12:31:58 -06:00
Evan Husted	f9e8f4bc29	docs: compat: Ori and the Will of the Wisps is now ingame, not playable	2025-01-11 06:10:58 -06:00
Evan Husted	7694c8c046	Do not auto release stable	2025-01-11 04:08:11 -06:00
Evan Husted	0dd789e8a5	misc: chore: remove redundant trimming on CompatibilityEntry.GameName init	2025-01-11 01:26:34 -06:00
Evan Husted	4e0aafd005	docs: compat: Trim redundant/duplicate information to save space	2025-01-11 01:18:10 -06:00
Evan Husted	c5091f499e	docs: compat: The House of the Dead: Remake Playable	2025-01-11 00:38:32 -06:00
Evan Husted	41c8fd8194	misc: chore: lol this field was misspelled	2025-01-10 23:23:53 -06:00
Evan Husted	d4a7ee25ea	misc: chore: use ObservableProperty on input view models	2025-01-10 23:23:05 -06:00
Evan Husted	3141c560fb	misc: chore: remove sender parameter from LdnGameData receieved event	2025-01-10 23:15:55 -06:00
Evan Husted	de341b285b	misc: use ObservableProperty on HotkeyConfig fields	2025-01-10 23:15:37 -06:00
Evan Husted	cc95e80ee9	misc: chore: Move converters into a directory in Helpers. Namespace unchanged	2025-01-10 20:24:53 -06:00
Evan Husted	d75ce52bd4	UI: Show play time in one time unit, maxing out at hours.	2025-01-10 20:23:47 -06:00
sunshineinabox	48f9ada59b	Support VK_EXT_extended_dynamic_state and VK_EXT_extended_dynamic_state2	2024-11-21 17:53:52 -08:00