HLE: Fix corrupted Mii structs (#5468)

* StructArrayHelpers: Add PureAttribute to all AsSpan() methods

* Fix broken Mii structs

.github/assign/audio.yml

@@ -1,8 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - marysaka
-
-filterLabels:
-  include:
-    - audio

.github/assign/cpu.yml

@@ -1,11 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - gdkchan
-  - riperiperi
-  - marysaka
-  - LDj3SNuD
-
-filterLabels:
-  include:
-    - cpu

.github/assign/global.yml

@@ -1,4 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - Ryujinx/developers

.github/assign/gpu.yml

@@ -1,10 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - gdkchan
-  - riperiperi
-  - marysaka
-
-filterLabels:
-  include:
-    - gpu

.github/assign/gui.yml

@@ -1,11 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - Ack77
-  - emmauss
-  - TSRBerry
-  - marysaka
-
-filterLabels:
-  include:
-    - gui

.github/assign/horizon.yml

@@ -1,11 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - gdkchan
-  - Ack77
-  - marysaka
-  - TSRBerry
-
-filterLabels:
-  include:
-    - horizon

.github/assign/infra.yml

@@ -1,9 +0,0 @@
-addReviewers: true
-
-reviewers:
-  - marysaka
-  - TSRBerry
-
-filterLabels:
-  include:
-    - infra

.github/reviewers.yml

@@ -0,0 +1,32 @@
+audio:
+  - marysaka
+
+cpu:
+  - gdkchan
+  - riperiperi
+  - marysaka
+  - LDj3SNuD
+
+gpu:
+  - gdkchan
+  - riperiperi
+  - marysaka
+
+gui:
+  - Ack77
+  - emmauss
+  - TSRBerry
+  - marysaka
+
+horizon:
+  - gdkchan
+  - Ack77
+  - marysaka
+  - TSRBerry
+
+infra:
+  - marysaka
+  - TSRBerry
+
+default:
+  - marysaka

.github/update_reviewers.py

@@ -0,0 +1,79 @@
+from pathlib import Path
+from typing import List, Set
+from github import Github
+from github.Repository import Repository
+from github.GithubException import GithubException
+
+import sys
+import yaml
+
+
+def add_reviewers(
+    reviewers: Set[str], team_reviewers: Set[str], new_entries: List[str]
+):
+    for reviewer in new_entries:
+        if reviewer.startswith("@"):
+            team_reviewers.add(reviewer[1:])
+        else:
+            reviewers.add(reviewer)
+
+
+def update_reviewers(config, repo: Repository, pr_id: int) -> int:
+    pull_request = repo.get_pull(pr_id)
+
+    if not pull_request:
+        sys.stderr.writable(f"Unknown PR #{pr_id}\n")
+        return 1
+
+    pull_request_author = pull_request.user.login
+    reviewers = set()
+    team_reviewers = set()
+
+    for label in pull_request.labels:
+        if label.name in config:
+            add_reviewers(reviewers, team_reviewers, config[label.name])
+
+    if "default" in config:
+        add_reviewers(reviewers, team_reviewers, config["default"])
+
+    if pull_request_author in reviewers:
+        reviewers.remove(pull_request_author)
+
+    try:
+        reviewers = list(reviewers)
+        team_reviewers = list(team_reviewers)
+        print(
+            f"Attempting to assign reviewers ({reviewers}) and team_reviewers ({team_reviewers})"
+        )
+        pull_request.create_review_request(reviewers, team_reviewers)
+        return 0
+    except GithubException as e:
+        sys.stderr.write(f"Cannot assign review request for PR #{pr_id}: {e}\n")
+        return 1
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 5:
+        sys.stderr.write("usage: <token> <repo_path> <pr_id> <config_path>\n")
+        sys.exit(1)
+
+    token = sys.argv[1]
+    repo_path = sys.argv[2]
+    pr_id = int(sys.argv[3])
+    config_path = Path(sys.argv[4])
+
+    g = Github(token)
+    repo = g.get_repo(repo_path)
+
+    if not repo:
+        sys.stderr.write("Repository not found!\n")
+        sys.exit(1)
+
+    if not config_path.exists():
+        sys.stderr.write(f'Config "{config_path}" not found!\n')
+        sys.exit(1)
+
+    with open(config_path, "r") as f:
+        config = yaml.safe_load(f)
+
+    sys.exit(update_reviewers(config, repo, pr_id))

.github/workflows/pr_triage.yml

@@ -12,43 +12,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      # Grab sources to get update_reviewers.py and reviewers.yml
+      - name: Fetch sources
+        uses: actions/checkout@v3
+        with:
+          # Ensure we pin the source origin as pull_request_target run under forks.
+          fetch-depth: 0
+          repository: Ryujinx/Ryujinx
+          ref: master
+
       - name: Update labels based on changes
         uses: actions/labeler@v4
         with:
           sync-labels: true
           dot: true
 
-      - name: Auto Assign [Audio]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/audio.yml'
-
-      - name: Auto Assign [CPU]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/cpu.yml'
-
-      - name: Auto Assign [GPU]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/gpu.yml'
-
-      - name: Auto Assign [GUI]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/gui.yml'
-
-      - name: Auto Assign [Horizon]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/horizon.yml'
-
-      - name: Auto Assign [Infra]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/infra.yml'
-
-      - name: Auto Assign [Global]
-        uses: kentaro-m/auto-assign-action@v1.2.5
-        with:
-          configuration-path: '.github/assign/global.yml'
+      - name: Assign reviewers
+        run: |
+          pip3 install PyGithub
+          python3 .github/update_reviewers.py ${{ secrets.GITHUB_TOKEN }} ${{ github.repository }} ${{ github.event.pull_request.number }} .github/reviewers.yml
+        shell: bash

Directory.Packages.props

@@ -34,7 +34,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.1-build13" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
-    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.26.3-build25" />
+    <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.28.1-build28" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.16.0" />

src/ARMeilleure/Instructions/SoftFloat.cs

@@ -1448,6 +1448,7 @@ namespace ARMeilleure.Instructions
             {
                 var overflowToInf = fpcr.GetRoundingMode() switch
                 {
+                    FPRoundingMode.ToNearest => true,
                     FPRoundingMode.TowardsPlusInfinity => !sign,
                     FPRoundingMode.TowardsMinusInfinity => sign,
                     FPRoundingMode.TowardsZero => false,
@@ -2879,6 +2880,7 @@ namespace ARMeilleure.Instructions
             {
                 var overflowToInf = fpcr.GetRoundingMode() switch
                 {
+                    FPRoundingMode.ToNearest => true,
                     FPRoundingMode.TowardsPlusInfinity => !sign,
                     FPRoundingMode.TowardsMinusInfinity => sign,
                     FPRoundingMode.TowardsZero => false,

src/Ryujinx.Ava/Common/ApplicationHelper.cs

@@ -114,7 +114,7 @@ namespace Ryujinx.Ava.Common
 
         public static void OpenSaveDir(ulong saveDataId)
         {
-            string saveRootPath = Path.Combine(_virtualFileSystem.GetNandPath(), $"user/save/{saveDataId:x16}");
+            string saveRootPath = Path.Combine(VirtualFileSystem.GetNandPath(), $"user/save/{saveDataId:x16}");
 
             if (!Directory.Exists(saveRootPath))
             {

src/Ryujinx.Ava/UI/Models/SaveModel.cs

@@ -2,6 +2,7 @@ using LibHac.Fs;
 using LibHac.Ncm;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
+using Ryujinx.HLE.FileSystem;
 using Ryujinx.Ui.App.Common;
 using System;
 using System.IO;
@@ -81,7 +82,7 @@ namespace Ryujinx.Ava.UI.Models
 
             Task.Run(() =>
             {
-                var saveRoot = Path.Combine(MainWindow.MainWindowViewModel.VirtualFileSystem.GetNandPath(), $"user/save/{info.SaveDataId:x16}");
+                var saveRoot = Path.Combine(VirtualFileSystem.GetNandPath(), $"user/save/{info.SaveDataId:x16}");
 
                 long totalSize = GetDirectorySize(saveRoot);
 

src/Ryujinx.Ava/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs

@@ -105,7 +105,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
 
             string contentPath = contentManager.GetInstalledContentPath(0x010000000000080A, StorageId.BuiltInSystem, NcaContentType.Data);
-            string avatarPath = virtualFileSystem.SwitchPathToSystemPath(contentPath);
+            string avatarPath = VirtualFileSystem.SwitchPathToSystemPath(contentPath);
 
             if (!string.IsNullOrWhiteSpace(avatarPath))
             {

src/Ryujinx.Common/Memory/StructArrayHelpers.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.Contracts;
 using System.Runtime.InteropServices;
 
 #pragma warning disable CS0169, IDE0051 // Remove unused private member
@@ -9,6 +10,8 @@ namespace Ryujinx.Common.Memory
         T _e0;
         public readonly int Length => 1;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -18,6 +21,8 @@ namespace Ryujinx.Common.Memory
         Array1<T> _other;
         public readonly int Length => 2;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -27,6 +32,8 @@ namespace Ryujinx.Common.Memory
         Array2<T> _other;
         public readonly int Length => 3;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -36,6 +43,8 @@ namespace Ryujinx.Common.Memory
         Array3<T> _other;
         public readonly int Length => 4;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -45,6 +54,8 @@ namespace Ryujinx.Common.Memory
         Array4<T> _other;
         public readonly int Length => 5;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -54,6 +65,8 @@ namespace Ryujinx.Common.Memory
         Array5<T> _other;
         public readonly int Length => 6;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -63,6 +76,8 @@ namespace Ryujinx.Common.Memory
         Array6<T> _other;
         public readonly int Length => 7;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -72,6 +87,8 @@ namespace Ryujinx.Common.Memory
         Array7<T> _other;
         public readonly int Length => 8;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -81,6 +98,8 @@ namespace Ryujinx.Common.Memory
         Array8<T> _other;
         public readonly int Length => 9;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -90,6 +109,8 @@ namespace Ryujinx.Common.Memory
         Array9<T> _other;
         public readonly int Length => 10;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -99,6 +120,8 @@ namespace Ryujinx.Common.Memory
         Array10<T> _other;
         public readonly int Length => 11;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -108,6 +131,8 @@ namespace Ryujinx.Common.Memory
         Array11<T> _other;
         public readonly int Length => 12;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -117,6 +142,8 @@ namespace Ryujinx.Common.Memory
         Array12<T> _other;
         public readonly int Length => 13;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -126,6 +153,8 @@ namespace Ryujinx.Common.Memory
         Array13<T> _other;
         public readonly int Length => 14;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -135,6 +164,8 @@ namespace Ryujinx.Common.Memory
         Array14<T> _other;
         public readonly int Length => 15;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -144,6 +175,8 @@ namespace Ryujinx.Common.Memory
         Array15<T> _other;
         public readonly int Length => 16;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -153,6 +186,8 @@ namespace Ryujinx.Common.Memory
         Array16<T> _other;
         public readonly int Length => 17;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -162,6 +197,8 @@ namespace Ryujinx.Common.Memory
         Array17<T> _other;
         public readonly int Length => 18;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -171,6 +208,8 @@ namespace Ryujinx.Common.Memory
         Array18<T> _other;
         public readonly int Length => 19;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -180,6 +219,8 @@ namespace Ryujinx.Common.Memory
         Array19<T> _other;
         public readonly int Length => 20;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -189,6 +230,8 @@ namespace Ryujinx.Common.Memory
         Array20<T> _other;
         public readonly int Length => 21;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -198,6 +241,8 @@ namespace Ryujinx.Common.Memory
         Array21<T> _other;
         public readonly int Length => 22;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -207,6 +252,8 @@ namespace Ryujinx.Common.Memory
         Array22<T> _other;
         public readonly int Length => 23;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -217,6 +264,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 24;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -227,6 +276,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 25;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -237,6 +288,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 26;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -247,6 +300,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 27;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -257,6 +312,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 28;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -267,6 +324,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 29;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -277,6 +336,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 30;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -287,6 +348,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 31;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -297,6 +360,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 32;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -307,6 +372,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 33;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -317,6 +384,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 34;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -327,6 +396,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 35;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -337,6 +408,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 36;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -347,6 +420,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 37;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -357,6 +432,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 38;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -367,6 +444,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 39;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -377,6 +456,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 40;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -387,6 +468,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 41;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -397,6 +480,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 42;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -407,6 +492,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 43;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -417,6 +504,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 44;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -427,6 +516,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 45;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -437,6 +528,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 46;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -447,6 +540,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 47;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -457,6 +552,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 48;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -467,6 +564,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 49;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -477,6 +576,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 50;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -487,6 +588,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 51;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -497,6 +600,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 52;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -507,6 +612,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 53;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -517,6 +624,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 54;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -527,6 +636,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 55;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -537,6 +648,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 56;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -547,6 +660,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 57;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -557,6 +672,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 58;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -567,6 +684,8 @@ namespace Ryujinx.Common.Memory
 
         public readonly int Length => 59;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -576,6 +695,8 @@ namespace Ryujinx.Common.Memory
         Array59<T> _other;
         public readonly int Length => 60;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -585,6 +706,8 @@ namespace Ryujinx.Common.Memory
         Array60<T> _other;
         public readonly int Length => 61;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -594,6 +717,8 @@ namespace Ryujinx.Common.Memory
         Array61<T> _other;
         public readonly int Length => 62;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -603,6 +728,8 @@ namespace Ryujinx.Common.Memory
         Array62<T> _other;
         public readonly int Length => 63;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -612,6 +739,8 @@ namespace Ryujinx.Common.Memory
         Array63<T> _other;
         public readonly int Length => 64;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -622,6 +751,8 @@ namespace Ryujinx.Common.Memory
         Array8<T> _other2;
         public readonly int Length => 73;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -632,6 +763,8 @@ namespace Ryujinx.Common.Memory
         Array62<T> _other2;
         public readonly int Length => 127;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -642,6 +775,8 @@ namespace Ryujinx.Common.Memory
         Array63<T> _other2;
         public readonly int Length => 128;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 
@@ -652,6 +787,8 @@ namespace Ryujinx.Common.Memory
         Array127<T> _other2;
         public readonly int Length => 256;
         public ref T this[int index] => ref AsSpan()[index];
+
+        [Pure]
         public Span<T> AsSpan() => MemoryMarshal.CreateSpan(ref _e0, Length);
     }
 }

src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs

@@ -168,6 +168,16 @@ namespace Ryujinx.Graphics.Vulkan
             return ComponentType.Float;
         }
 
+        public ImageAspectFlags GetDepthStencilAspectFlags()
+        {
+            if (_depthStencil == null)
+            {
+                return ImageAspectFlags.None;
+            }
+
+            return _depthStencil.Info.Format.ConvertAspectFlags();
+        }
+
         public bool IsValidColorAttachment(int bindIndex)
         {
             return (uint)bindIndex < Constants.MaxRenderTargets && (_validColorAttachments & (1u << bindIndex)) != 0;
@@ -226,7 +236,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             _depthStencil?.Storage.SetModification(
                 AccessFlags.DepthStencilAttachmentWriteBit,
-                PipelineStageFlags.ColorAttachmentOutputBit);
+                PipelineStageFlags.LateFragmentTestsBit);
         }
 
         public void InsertClearBarrier(CommandBufferScoped cbs, int index)

src/Ryujinx.Graphics.Vulkan/HelperShader.cs

@@ -1,10 +1,11 @@
-using Ryujinx.Graphics.GAL;
+using Ryujinx.Common;
+using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
 using Ryujinx.Graphics.Shader.Translation;
-using Ryujinx.Graphics.Vulkan.Shaders;
 using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Numerics;
 using CompareOp = Ryujinx.Graphics.GAL.CompareOp;
 using Format = Ryujinx.Graphics.GAL.Format;
@@ -26,6 +27,7 @@ namespace Ryujinx.Graphics.Vulkan
     class HelperShader : IDisposable
     {
         private const int UniformBufferAlignment = 256;
+        private const string ShaderBinariesPath = "Ryujinx.Graphics.Vulkan/Shaders/SpirvBinaries";
 
         private readonly PipelineHelperShader _pipeline;
         private readonly ISampler _samplerLinear;
@@ -67,40 +69,40 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programColorBlit = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorBlitFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, blitResourceLayout);
 
             _programColorBlitMs = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorBlitMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, blitResourceLayout);
 
             _programColorBlitClearAlpha = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorBlitClearAlphaFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitClearAlphaFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, blitResourceLayout);
 
             var colorClearResourceLayout = new ResourceLayoutBuilder().Add(ResourceStages.Vertex, ResourceType.UniformBuffer, 1).Build();
 
             _programColorClearF = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorClearVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorClearFFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorClearVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorClearFFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, colorClearResourceLayout);
 
             _programColorClearSI = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorClearVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorClearSIFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorClearVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorClearSIFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, colorClearResourceLayout);
 
             _programColorClearUI = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorClearVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorClearUIFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorClearVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorClearUIFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, colorClearResourceLayout);
 
             var strideChangeResourceLayout = new ResourceLayoutBuilder()
@@ -110,7 +112,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programStrideChange = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ChangeBufferStrideShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ChangeBufferStride.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, strideChangeResourceLayout);
 
             var colorCopyResourceLayout = new ResourceLayoutBuilder()
@@ -120,17 +122,17 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programColorCopyShortening = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorCopyShorteningComputeShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorCopyShorteningCompute.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, colorCopyResourceLayout);
 
             _programColorCopyToNonMs = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorCopyToNonMsComputeShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorCopyToNonMsCompute.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, colorCopyResourceLayout);
 
             _programColorCopyWidening = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorCopyWideningComputeShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorCopyWideningCompute.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, colorCopyResourceLayout);
 
             var colorDrawToMsResourceLayout = new ResourceLayoutBuilder()
@@ -139,8 +141,8 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programColorDrawToMs = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorDrawToMsVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.ColorDrawToMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorDrawToMsVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorDrawToMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, colorDrawToMsResourceLayout);
 
             var convertD32S8ToD24S8ResourceLayout = new ResourceLayoutBuilder()
@@ -150,7 +152,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programConvertD32S8ToD24S8 = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ConvertD32S8ToD24S8ShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ConvertD32S8ToD24S8.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, convertD32S8ToD24S8ResourceLayout);
 
             var convertIndexBufferResourceLayout = new ResourceLayoutBuilder()
@@ -160,7 +162,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programConvertIndexBuffer = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ConvertIndexBufferShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ConvertIndexBuffer.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, convertIndexBufferResourceLayout);
 
             var convertIndirectDataResourceLayout = new ResourceLayoutBuilder()
@@ -171,61 +173,66 @@ namespace Ryujinx.Graphics.Vulkan
 
             _programConvertIndirectData = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ConvertIndirectDataShaderSource, ShaderStage.Compute, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ConvertIndirectData.spv"), ShaderStage.Compute, TargetLanguage.Spirv),
             }, convertIndirectDataResourceLayout);
 
             _programDepthBlit = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.DepthBlitFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("DepthBlitFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, blitResourceLayout);
 
             _programDepthBlitMs = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.DepthBlitMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("DepthBlitMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, blitResourceLayout);
 
             _programDepthDrawToMs = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorDrawToMsVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.DepthDrawToMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorDrawToMsVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("DepthDrawToMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, colorDrawToMsResourceLayout);
 
             _programDepthDrawToNonMs = gd.CreateProgramWithMinimalLayout(new[]
             {
-                new ShaderSource(ShaderBinaries.ColorDrawToMsVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                new ShaderSource(ShaderBinaries.DepthDrawToNonMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("ColorDrawToMsVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                new ShaderSource(ReadSpirv("DepthDrawToNonMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
             }, colorDrawToMsResourceLayout);
 
             if (gd.Capabilities.SupportsShaderStencilExport)
             {
                 _programStencilBlit = gd.CreateProgramWithMinimalLayout(new[]
                 {
-                    new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                    new ShaderSource(ShaderBinaries.StencilBlitFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("StencilBlitFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
                 }, blitResourceLayout);
 
                 _programStencilBlitMs = gd.CreateProgramWithMinimalLayout(new[]
                 {
-                    new ShaderSource(ShaderBinaries.ColorBlitVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                    new ShaderSource(ShaderBinaries.StencilBlitMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("ColorBlitVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("StencilBlitMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
                 }, blitResourceLayout);
 
                 _programStencilDrawToMs = gd.CreateProgramWithMinimalLayout(new[]
                 {
-                    new ShaderSource(ShaderBinaries.ColorDrawToMsVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                    new ShaderSource(ShaderBinaries.StencilDrawToMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("ColorDrawToMsVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("StencilDrawToMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
                 }, colorDrawToMsResourceLayout);
 
                 _programStencilDrawToNonMs = gd.CreateProgramWithMinimalLayout(new[]
                 {
-                    new ShaderSource(ShaderBinaries.ColorDrawToMsVertexShaderSource, ShaderStage.Vertex, TargetLanguage.Spirv),
-                    new ShaderSource(ShaderBinaries.StencilDrawToNonMsFragmentShaderSource, ShaderStage.Fragment, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("ColorDrawToMsVertex.spv"), ShaderStage.Vertex, TargetLanguage.Spirv),
+                    new ShaderSource(ReadSpirv("StencilDrawToNonMsFragment.spv"), ShaderStage.Fragment, TargetLanguage.Spirv),
                 }, colorDrawToMsResourceLayout);
             }
         }
 
+        private static byte[] ReadSpirv(string fileName)
+        {
+            return EmbeddedResources.Read(string.Join('/', ShaderBinariesPath, fileName));
+        }
+
         public void Blit(
             VulkanRenderer gd,
             TextureView src,

src/Ryujinx.Graphics.Vulkan/IndexBufferState.cs

@@ -152,9 +152,6 @@ namespace Ryujinx.Graphics.Vulkan
         {
             if (_buffer == from)
             {
-                _buffer.DecrementReferenceCount();
-                to.IncrementReferenceCount();
-
                 _buffer = to;
             }
         }

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -245,13 +245,28 @@ namespace Ryujinx.Graphics.Vulkan
 
         public unsafe void ClearRenderTargetDepthStencil(int layer, int layerCount, float depthValue, bool depthMask, int stencilValue, int stencilMask)
         {
-            // TODO: Use stencilMask (fully)
+            // TODO: Use stencilMask (fully).
 
             if (FramebufferParams == null || !FramebufferParams.HasDepthStencil)
             {
                 return;
             }
 
+            var clearValue = new ClearValue(null, new ClearDepthStencilValue(depthValue, (uint)stencilValue));
+            var flags = depthMask ? ImageAspectFlags.DepthBit : 0;
+
+            if (stencilMask != 0)
+            {
+                flags |= ImageAspectFlags.StencilBit;
+            }
+
+            flags &= FramebufferParams.GetDepthStencilAspectFlags();
+
+            if (flags == ImageAspectFlags.None)
+            {
+                return;
+            }
+
             if (_renderPass == null)
             {
                 CreateRenderPass();
@@ -259,14 +274,6 @@ namespace Ryujinx.Graphics.Vulkan
 
             BeginRenderPass();
 
-            var clearValue = new ClearValue(null, new ClearDepthStencilValue(depthValue, (uint)stencilValue));
-            var flags = depthMask ? ImageAspectFlags.DepthBit : 0;
-
-            if (stencilMask != 0)
-            {
-                flags |= ImageAspectFlags.StencilBit;
-            }
-
             var attachment = new ClearAttachment(flags, 0, clearValue);
             var clearRect = FramebufferParams.GetClearRect(ClearScissor, layer, layerCount);
 
@@ -935,7 +942,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             SignalStateChange();
 
-            if (_program.IsCompute)
+            if (internalProgram.IsCompute)
             {
                 EndRenderPass();
             }

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -21,6 +21,31 @@
     <EmbeddedResource Include="Effects\Shaders\SmaaBlend.spv" />
     <EmbeddedResource Include="Effects\Shaders\SmaaEdge.spv" />
     <EmbeddedResource Include="Effects\Shaders\SmaaNeighbour.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ChangeBufferStride.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorBlitClearAlphaFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorBlitFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorBlitMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorBlitVertex.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorClearFFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorClearSIFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorClearUIFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorClearVertex.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorCopyShorteningCompute.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorCopyToNonMsCompute.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorCopyWideningCompute.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorDrawToMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ColorDrawToMsVertex.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ConvertD32S8ToD24S8.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ConvertIndexBuffer.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\ConvertIndirectData.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\DepthBlitFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\DepthBlitMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\DepthDrawToMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\DepthDrawToNonMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\StencilBlitFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\StencilBlitMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\StencilDrawToMsFragment.spv" />
+    <EmbeddedResource Include="Shaders\SpirvBinaries\StencilDrawToNonMsFragment.spv" />
   </ItemGroup>
 
   <ItemGroup>

src/Ryujinx.Graphics.Vulkan/TextureStorage.cs

@@ -78,7 +78,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             var sampleCountFlags = ConvertToSampleCountFlags(gd.Capabilities.SupportedSampleCounts, (uint)info.Samples);
 
-            var usage = GetImageUsage(info.Format, info.Target, gd.Capabilities.SupportsShaderStorageImageMultisample);
+            var usage = GetImageUsage(info.Format, info.Target, gd.Capabilities.SupportsShaderStorageImageMultisample, forceStorage: true);
 
             var flags = ImageCreateFlags.CreateMutableFormatBit;
 
@@ -291,7 +291,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        public static ImageUsageFlags GetImageUsage(Format format, Target target, bool supportsMsStorage)
+        public static ImageUsageFlags GetImageUsage(Format format, Target target, bool supportsMsStorage, bool forceStorage = false)
         {
             var usage = DefaultUsageFlags;
 
@@ -304,7 +304,7 @@ namespace Ryujinx.Graphics.Vulkan
                 usage |= ImageUsageFlags.ColorAttachmentBit;
             }
 
-            if (format.IsImageCompatible() && (supportsMsStorage || !target.IsMultisample()))
+            if (((forceStorage && !format.IsDepthOrStencil()) || format.IsImageCompatible()) && (supportsMsStorage || !target.IsMultisample()))
             {
                 usage |= ImageUsageFlags.StorageBit;
             }

src/Ryujinx.Graphics.Vulkan/TextureView.cs

@@ -116,7 +116,14 @@ namespace Ryujinx.Graphics.Vulkan
                 return new Auto<DisposableImageView>(new DisposableImageView(gd.Api, device, imageView), null, storage.GetImage());
             }
 
-            _imageView = CreateImageView(componentMapping, subresourceRange, type, ImageUsageFlags.SampledBit);
+            ImageUsageFlags shaderUsage = ImageUsageFlags.SampledBit;
+
+            if (info.Format.IsImageCompatible())
+            {
+                shaderUsage |= ImageUsageFlags.StorageBit;
+            }
+
+            _imageView = CreateImageView(componentMapping, subresourceRange, type, shaderUsage);
 
             // Framebuffer attachments and storage images requires a identity component mapping.
             var identityComponentMapping = new ComponentMapping(
@@ -378,7 +385,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             bool isDepthOrStencil = dst.Info.Format.IsDepthOrStencil();
 
-            if (VulkanConfiguration.UseSlowSafeBlitOnAmd && (_gd.Vendor == Vendor.Amd || _gd.IsMoltenVk))
+            if (!VulkanConfiguration.UseUnsafeBlit || (_gd.Vendor != Vendor.Nvidia && _gd.Vendor != Vendor.Intel))
             {
                 _gd.HelperShader.Blit(
                     _gd,

src/Ryujinx.Graphics.Vulkan/VulkanConfiguration.cs

@@ -3,7 +3,7 @@
     static class VulkanConfiguration
     {
         public const bool UseFastBufferUpdates = true;
-        public const bool UseSlowSafeBlitOnAmd = true;
+        public const bool UseUnsafeBlit = true;
         public const bool UsePushDescriptors = false;
 
         public const bool ForceD24S8Unsupported = false;

src/Ryujinx.Graphics.Vulkan/VulkanDebugMessenger.cs

@@ -10,17 +10,6 @@ namespace Ryujinx.Graphics.Vulkan
 {
     class VulkanDebugMessenger : IDisposable
     {
-        private static readonly string[] _excludedMessages = {
-            // NOTE: Done on purpose right now.
-            "UNASSIGNED-CoreValidation-Shader-OutputNotConsumed",
-            // TODO: Figure out if fixable
-            "VUID-vkCmdDrawIndexed-None-04584",
-            // TODO: Might be worth looking into making this happy to possibly optimize copies.
-            "UNASSIGNED-CoreValidation-DrawState-InvalidImageLayout",
-            // TODO: Fix this, it's causing too much noise right now.
-            "VUID-VkSubpassDependency-srcSubpass-00867",
-        };
-
         private readonly Vk _api;
         private readonly Instance _instance;
         private readonly GraphicsDebugLevel _logLevel;
@@ -108,14 +97,6 @@ namespace Ryujinx.Graphics.Vulkan
         {
             var msg = Marshal.PtrToStringAnsi((IntPtr)pCallbackData->PMessage);
 
-            foreach (string excludedMessagePart in _excludedMessages)
-            {
-                if (msg.Contains(excludedMessagePart))
-                {
-                    return 0;
-                }
-            }
-
             if (messageSeverity.HasFlag(DebugUtilsMessageSeverityFlagsEXT.ErrorBitExt))
             {
                 Logger.Error?.Print(LogClass.Gpu, msg);

src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

@@ -377,8 +377,8 @@ namespace Ryujinx.Graphics.Vulkan
                 ShaderFloat64 = supportedFeatures.ShaderFloat64,
                 ShaderImageGatherExtended = supportedFeatures.ShaderImageGatherExtended,
                 ShaderStorageImageMultisample = supportedFeatures.ShaderStorageImageMultisample,
-                // ShaderStorageImageReadWithoutFormat = true,
-                // ShaderStorageImageWriteWithoutFormat = true,
+                ShaderStorageImageReadWithoutFormat = supportedFeatures.ShaderStorageImageReadWithoutFormat,
+                ShaderStorageImageWriteWithoutFormat = supportedFeatures.ShaderStorageImageWriteWithoutFormat,
                 TessellationShader = supportedFeatures.TessellationShader,
                 VertexPipelineStoresAndAtomics = supportedFeatures.VertexPipelineStoresAndAtomics,
                 RobustBufferAccess = useRobustBufferAccess,

src/Ryujinx.HLE/AssemblyInfo.cs

@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Ryujinx.Tests")]
+[assembly: InternalsVisibleTo("Ryujinx.Tests")]

src/Ryujinx.HLE/Exceptions/GuestBrokeExecutionException.cs

@@ -8,4 +8,4 @@ namespace Ryujinx.HLE.Exceptions
 
         public GuestBrokeExecutionException() : base(ExMsg) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/InternalServiceException.cs

@@ -2,8 +2,8 @@
 
 namespace Ryujinx.HLE.Exceptions
 {
-    class InternalServiceException: Exception
+    class InternalServiceException : Exception
     {
         public InternalServiceException(string message) : base(message) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/InvalidFirmwarePackageException.cs

@@ -6,4 +6,4 @@ namespace Ryujinx.HLE.Exceptions
     {
         public InvalidFirmwarePackageException(string message) : base(message) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/InvalidNpdmException.cs

@@ -6,4 +6,4 @@ namespace Ryujinx.HLE.Exceptions
     {
         public InvalidNpdmException(string message) : base(message) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/InvalidStructLayoutException.cs

@@ -3,13 +3,13 @@ using System.Runtime.CompilerServices;
 
 namespace Ryujinx.HLE.Exceptions
 {
-    public class InvalidStructLayoutException<T> : Exception 
+    public class InvalidStructLayoutException<T> : Exception
     {
         static readonly Type _structType = typeof(T);
 
         public InvalidStructLayoutException(string message) : base(message) { }
-        
+
         public InvalidStructLayoutException(int expectedSize)
             : base($"Type {_structType.Name} has the wrong size. Expected: {expectedSize} bytes, got: {Unsafe.SizeOf<T>()} bytes") { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/InvalidSystemResourceException.cs

@@ -6,4 +6,4 @@ namespace Ryujinx.HLE.Exceptions
     {
         public InvalidSystemResourceException(string message) : base(message) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs

@@ -47,7 +47,7 @@ namespace Ryujinx.HLE.Exceptions
 
         private string BuildMessage()
         {
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new();
 
             // Print the IPC command details (service name, command ID, and handler)
             (Type callingType, MethodBase callingMethod) = WalkStackTrace(new StackTrace(this));
@@ -58,9 +58,9 @@ namespace Ryujinx.HLE.Exceptions
                 var ipcCommands = Request.Type > IpcMessageType.TipcCloseSession ? Service.TipcCommands : Service.CmifCommands;
 
                 // Find the handler for the method called
-                var ipcHandler   = ipcCommands.FirstOrDefault(x => x.Value == callingMethod);
+                var ipcHandler = ipcCommands.FirstOrDefault(x => x.Value == callingMethod);
                 var ipcCommandId = ipcHandler.Key;
-                var ipcMethod    = ipcHandler.Value;
+                var ipcMethod = ipcHandler.Value;
 
                 if (ipcMethod != null)
                 {
@@ -73,9 +73,9 @@ namespace Ryujinx.HLE.Exceptions
             sb.AppendLine(Context.Thread.GetGuestStackTrace());
 
             // Print buffer information
-            if (Request.PtrBuff.Count      > 0 ||
-                Request.SendBuff.Count     > 0 ||
-                Request.ReceiveBuff.Count  > 0 ||
+            if (Request.PtrBuff.Count > 0 ||
+                Request.SendBuff.Count > 0 ||
+                Request.ReceiveBuff.Count > 0 ||
                 Request.ExchangeBuff.Count > 0 ||
                 Request.RecvListBuff.Count > 0)
             {
@@ -149,7 +149,7 @@ namespace Ryujinx.HLE.Exceptions
             // Find the IIpcService method that threw this exception
             while ((frame = trace.GetFrame(i++)) != null)
             {
-                var method   = frame.GetMethod();
+                var method = frame.GetMethod();
                 var declType = method.DeclaringType;
 
                 if (typeof(IpcService).IsAssignableFrom(declType))
@@ -161,4 +161,4 @@ namespace Ryujinx.HLE.Exceptions
             return (null, null);
         }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/TamperCompilationException.cs

@@ -6,4 +6,4 @@ namespace Ryujinx.HLE.Exceptions
     {
         public TamperCompilationException(string message) : base(message) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/TamperExecutionException.cs

@@ -6,4 +6,4 @@ namespace Ryujinx.HLE.Exceptions
     {
         public TamperExecutionException(string message) : base(message) { }
     }
-}
+}

src/Ryujinx.HLE/Exceptions/UndefinedInstructionException.cs

@@ -10,4 +10,4 @@ namespace Ryujinx.HLE.Exceptions
 
         public UndefinedInstructionException(ulong address, int opCode) : base(string.Format(ExMsg, address, opCode)) { }
     }
-}
+}

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -26,17 +26,17 @@ namespace Ryujinx.HLE.FileSystem
     public class ContentManager
     {
         private const ulong SystemVersionTitleId = 0x0100000000000809;
-        private const ulong SystemUpdateTitleId  = 0x0100000000000816;
+        private const ulong SystemUpdateTitleId = 0x0100000000000816;
 
         private Dictionary<StorageId, LinkedList<LocationEntry>> _locationEntries;
 
-        private Dictionary<string, ulong>  _sharedFontTitleDictionary;
-        private Dictionary<ulong, string>  _systemTitlesNameDictionary;
-        private Dictionary<string, string> _sharedFontFilenameDictionary;
+        private readonly Dictionary<string, ulong> _sharedFontTitleDictionary;
+        private readonly Dictionary<ulong, string> _systemTitlesNameDictionary;
+        private readonly Dictionary<string, string> _sharedFontFilenameDictionary;
 
         private SortedDictionary<(ulong titleId, NcaContentType type), string> _contentDictionary;
 
-        private struct AocItem
+        private readonly struct AocItem
         {
             public readonly string ContainerPath;
             public readonly string NcaPath;
@@ -48,16 +48,16 @@ namespace Ryujinx.HLE.FileSystem
             }
         }
 
-        private SortedList<ulong, AocItem> _aocData { get; }
+        private SortedList<ulong, AocItem> AocData { get; }
 
-        private VirtualFileSystem _virtualFileSystem;
+        private readonly VirtualFileSystem _virtualFileSystem;
 
         private readonly object _lock = new();
 
         public ContentManager(VirtualFileSystem virtualFileSystem)
         {
             _contentDictionary = new SortedDictionary<(ulong, NcaContentType), string>();
-            _locationEntries   = new Dictionary<StorageId, LinkedList<LocationEntry>>();
+            _locationEntries = new Dictionary<StorageId, LinkedList<LocationEntry>>();
 
             _sharedFontTitleDictionary = new Dictionary<string, ulong>
             {
@@ -66,7 +66,7 @@ namespace Ryujinx.HLE.FileSystem
                 { "FontExtendedChineseSimplified", 0x0100000000000814 },
                 { "FontKorean",                    0x0100000000000812 },
                 { "FontChineseTraditional",        0x0100000000000813 },
-                { "FontNintendoExtended",          0x0100000000000810 }
+                { "FontNintendoExtended",          0x0100000000000810 },
             };
 
             _systemTitlesNameDictionary = new Dictionary<ulong, string>()
@@ -86,12 +86,12 @@ namespace Ryujinx.HLE.FileSystem
                 { "FontExtendedChineseSimplified", "nintendo_udsg-r_ext_zh-cn_003.bfttf" },
                 { "FontKorean",                    "nintendo_udsg-r_ko_003.bfttf" },
                 { "FontChineseTraditional",        "nintendo_udjxh-db_zh-tw_003.bfttf" },
-                { "FontNintendoExtended",          "nintendo_ext_003.bfttf" }
+                { "FontNintendoExtended",          "nintendo_ext_003.bfttf" },
             };
 
             _virtualFileSystem = virtualFileSystem;
 
-            _aocData = new SortedList<ulong, AocItem>();
+            AocData = new SortedList<ulong, AocItem>();
         }
 
         public void LoadEntries(Switch device = null)
@@ -99,18 +99,18 @@ namespace Ryujinx.HLE.FileSystem
             lock (_lock)
             {
                 _contentDictionary = new SortedDictionary<(ulong, NcaContentType), string>();
-                _locationEntries   = new Dictionary<StorageId, LinkedList<LocationEntry>>();
+                _locationEntries = new Dictionary<StorageId, LinkedList<LocationEntry>>();
 
                 foreach (StorageId storageId in Enum.GetValues<StorageId>())
                 {
-                    string contentDirectory    = null;
-                    string contentPathString   = null;
+                    string contentDirectory = null;
+                    string contentPathString = null;
                     string registeredDirectory = null;
 
                     try
                     {
-                        contentPathString   = ContentPath.GetContentPath(storageId);
-                        contentDirectory    = ContentPath.GetRealPath(_virtualFileSystem, contentPathString);
+                        contentPathString = ContentPath.GetContentPath(storageId);
+                        contentDirectory = ContentPath.GetRealPath(contentPathString);
                         registeredDirectory = Path.Combine(contentDirectory, "registered");
                     }
                     catch (NotSupportedException)
@@ -120,7 +120,7 @@ namespace Ryujinx.HLE.FileSystem
 
                     Directory.CreateDirectory(registeredDirectory);
 
-                    LinkedList<LocationEntry> locationList = new LinkedList<LocationEntry>();
+                    LinkedList<LocationEntry> locationList = new();
 
                     void AddEntry(LocationEntry entry)
                     {
@@ -133,24 +133,19 @@ namespace Ryujinx.HLE.FileSystem
                         {
                             string ncaName = new DirectoryInfo(directoryPath).Name.Replace(".nca", string.Empty);
 
-                            using (FileStream ncaFile = File.OpenRead(Directory.GetFiles(directoryPath)[0]))
-                            {
-                                Nca nca = new Nca(_virtualFileSystem.KeySet, ncaFile.AsStorage());
+                            using FileStream ncaFile = File.OpenRead(Directory.GetFiles(directoryPath)[0]);
+                            Nca nca = new(_virtualFileSystem.KeySet, ncaFile.AsStorage());
 
-                                string switchPath = contentPathString + ":/" + ncaFile.Name.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
+                            string switchPath = contentPathString + ":/" + ncaFile.Name.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
 
-                                // Change path format to switch's
-                                switchPath = switchPath.Replace('\\', '/');
+                            // Change path format to switch's
+                            switchPath = switchPath.Replace('\\', '/');
 
-                                LocationEntry entry = new LocationEntry(switchPath,
-                                                                        0,
-                                                                        nca.Header.TitleId,
-                                                                        nca.Header.ContentType);
+                            LocationEntry entry = new(switchPath, 0, nca.Header.TitleId, nca.Header.ContentType);
 
-                                AddEntry(entry);
+                            AddEntry(entry);
 
-                                _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
-                            }
+                            _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
                         }
                     }
 
@@ -160,24 +155,19 @@ namespace Ryujinx.HLE.FileSystem
                         {
                             string ncaName = Path.GetFileNameWithoutExtension(filePath);
 
-                            using (FileStream ncaFile = new FileStream(filePath, FileMode.Open, FileAccess.Read))
-                            {
-                                Nca nca = new Nca(_virtualFileSystem.KeySet, ncaFile.AsStorage());
+                            using FileStream ncaFile = new(filePath, FileMode.Open, FileAccess.Read);
+                            Nca nca = new(_virtualFileSystem.KeySet, ncaFile.AsStorage());
 
-                                string switchPath = contentPathString + ":/" + filePath.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
+                            string switchPath = contentPathString + ":/" + filePath.Replace(contentDirectory, string.Empty).TrimStart(Path.DirectorySeparatorChar);
 
-                                // Change path format to switch's
-                                switchPath = switchPath.Replace('\\', '/');
+                            // Change path format to switch's
+                            switchPath = switchPath.Replace('\\', '/');
 
-                                LocationEntry entry = new LocationEntry(switchPath,
-                                                                        0,
-                                                                        nca.Header.TitleId,
-                                                                        nca.Header.ContentType);
+                            LocationEntry entry = new(switchPath, 0, nca.Header.TitleId, nca.Header.ContentType);
 
-                                AddEntry(entry);
+                            AddEntry(entry);
 
-                                _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
-                            }
+                            _contentDictionary.Add((nca.Header.TitleId, nca.Header.ContentType), ncaName);
                         }
                     }
 
@@ -186,10 +176,7 @@ namespace Ryujinx.HLE.FileSystem
                         _locationEntries.Remove(storageId);
                     }
 
-                    if (!_locationEntries.ContainsKey(storageId))
-                    {
-                        _locationEntries.Add(storageId, locationList);
-                    }
+                    _locationEntries.TryAdd(storageId, locationList);
                 }
 
                 if (device != null)
@@ -239,7 +226,7 @@ namespace Ryujinx.HLE.FileSystem
         public void AddAocItem(ulong titleId, string containerPath, string ncaPath, bool mergedToContainer = false)
         {
             // TODO: Check Aoc version.
-            if (!_aocData.TryAdd(titleId, new AocItem(containerPath, ncaPath)))
+            if (!AocData.TryAdd(titleId, new AocItem(containerPath, ncaPath)))
             {
                 Logger.Warning?.Print(LogClass.Application, $"Duplicate AddOnContent detected. TitleId {titleId:X16}");
             }
@@ -249,7 +236,7 @@ namespace Ryujinx.HLE.FileSystem
 
                 if (!mergedToContainer)
                 {
-                    using FileStream          fileStream          = File.OpenRead(containerPath);
+                    using FileStream fileStream = File.OpenRead(containerPath);
                     using PartitionFileSystem partitionFileSystem = new(fileStream.AsStorage());
 
                     _virtualFileSystem.ImportTickets(partitionFileSystem);
@@ -257,17 +244,17 @@ namespace Ryujinx.HLE.FileSystem
             }
         }
 
-        public void ClearAocData() => _aocData.Clear();
+        public void ClearAocData() => AocData.Clear();
 
-        public int GetAocCount() => _aocData.Count;
+        public int GetAocCount() => AocData.Count;
 
-        public IList<ulong> GetAocTitleIds() => _aocData.Select(e => e.Key).ToList();
+        public IList<ulong> GetAocTitleIds() => AocData.Select(e => e.Key).ToList();
 
         public bool GetAocDataStorage(ulong aocTitleId, out IStorage aocStorage, IntegrityCheckLevel integrityCheckLevel)
         {
             aocStorage = null;
 
-            if (_aocData.TryGetValue(aocTitleId, out AocItem aoc))
+            if (AocData.TryGetValue(aocTitleId, out AocItem aoc))
             {
                 var file = new FileStream(aoc.ContainerPath, FileMode.Open, FileAccess.Read);
                 using var ncaFile = new UniqueRef<IFile>();
@@ -307,7 +294,7 @@ namespace Ryujinx.HLE.FileSystem
         {
             lock (_lock)
             {
-                LinkedList<LocationEntry> locationList      = _locationEntries[storageId];
+                LinkedList<LocationEntry> locationList = _locationEntries[storageId];
                 LinkedListNode<LocationEntry> locationEntry = locationList.First;
 
                 while (locationEntry != null)
@@ -331,7 +318,7 @@ namespace Ryujinx.HLE.FileSystem
                 if (_contentDictionary.ContainsValue(ncaId))
                 {
                     var content = _contentDictionary.FirstOrDefault(x => x.Value == ncaId);
-                    ulong titleId = content.Key.Item1;
+                    ulong titleId = content.Key.titleId;
 
                     NcaContentType contentType = content.Key.type;
                     StorageId storage = GetInstalledStorage(titleId, contentType, storageId);
@@ -403,19 +390,17 @@ namespace Ryujinx.HLE.FileSystem
                 return false;
             }
 
-            string installedPath = _virtualFileSystem.SwitchPathToSystemPath(locationEntry.ContentPath);
+            string installedPath = VirtualFileSystem.SwitchPathToSystemPath(locationEntry.ContentPath);
 
             if (!string.IsNullOrWhiteSpace(installedPath))
             {
                 if (File.Exists(installedPath))
                 {
-                    using (FileStream file = new FileStream(installedPath, FileMode.Open, FileAccess.Read))
-                    {
-                        Nca nca = new Nca(_virtualFileSystem.KeySet, file.AsStorage());
-                        bool contentCheck = nca.Header.ContentType == contentType;
+                    using FileStream file = new(installedPath, FileMode.Open, FileAccess.Read);
+                    Nca nca = new(_virtualFileSystem.KeySet, file.AsStorage());
+                    bool contentCheck = nca.Header.ContentType == contentType;
 
-                        return contentCheck;
-                    }
+                    return contentCheck;
                 }
             }
 
@@ -426,9 +411,9 @@ namespace Ryujinx.HLE.FileSystem
         {
             LinkedList<LocationEntry> locationList = null;
 
-            if (_locationEntries.ContainsKey(storageId))
+            if (_locationEntries.TryGetValue(storageId, out LinkedList<LocationEntry> locationEntry))
             {
-                locationList = _locationEntries[storageId];
+                locationList = locationEntry;
             }
 
             if (locationList != null)
@@ -446,9 +431,9 @@ namespace Ryujinx.HLE.FileSystem
         {
             LinkedList<LocationEntry> locationList = null;
 
-            if (_locationEntries.ContainsKey(storageId))
+            if (_locationEntries.TryGetValue(storageId, out LinkedList<LocationEntry> locationEntry))
             {
-                locationList = _locationEntries[storageId];
+                locationList = locationEntry;
             }
 
             if (locationList != null)
@@ -487,10 +472,10 @@ namespace Ryujinx.HLE.FileSystem
 
         public void InstallFirmware(string firmwareSource)
         {
-            string contentPathString   = ContentPath.GetContentPath(StorageId.BuiltInSystem);
-            string contentDirectory    = ContentPath.GetRealPath(_virtualFileSystem, contentPathString);
+            string contentPathString = ContentPath.GetContentPath(StorageId.BuiltInSystem);
+            string contentDirectory = ContentPath.GetRealPath(contentPathString);
             string registeredDirectory = Path.Combine(contentDirectory, "registered");
-            string temporaryDirectory  = Path.Combine(contentDirectory, "temp");
+            string temporaryDirectory = Path.Combine(contentDirectory, "temp");
 
             if (Directory.Exists(temporaryDirectory))
             {
@@ -510,28 +495,27 @@ namespace Ryujinx.HLE.FileSystem
                 throw new FileNotFoundException("Firmware file does not exist.");
             }
 
-            FileInfo info = new FileInfo(firmwareSource);
+            FileInfo info = new(firmwareSource);
 
-            using (FileStream file = File.OpenRead(firmwareSource))
+            using FileStream file = File.OpenRead(firmwareSource);
+
+            switch (info.Extension)
             {
-                switch (info.Extension)
-                {
-                    case ".zip":
-                        using (ZipArchive archive = ZipFile.OpenRead(firmwareSource))
-                        {
-                            InstallFromZip(archive, temporaryDirectory);
-                        }
-                        break;
-                    case ".xci":
-                        Xci xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage());
-                        InstallFromCart(xci, temporaryDirectory);
-                        break;
-                    default:
-                        throw new InvalidFirmwarePackageException("Input file is not a valid firmware package");
-                }
-
-                FinishInstallation(temporaryDirectory, registeredDirectory);
+                case ".zip":
+                    using (ZipArchive archive = ZipFile.OpenRead(firmwareSource))
+                    {
+                        InstallFromZip(archive, temporaryDirectory);
+                    }
+                    break;
+                case ".xci":
+                    Xci xci = new(_virtualFileSystem.KeySet, file.AsStorage());
+                    InstallFromCart(xci, temporaryDirectory);
+                    break;
+                default:
+                    throw new InvalidFirmwarePackageException("Input file is not a valid firmware package");
             }
+
+            FinishInstallation(temporaryDirectory, registeredDirectory);
         }
 
         private void FinishInstallation(string temporaryDirectory, string registeredDirectory)
@@ -555,7 +539,7 @@ namespace Ryujinx.HLE.FileSystem
         {
             foreach (var entry in filesystem.EnumerateEntries("/", "*.nca"))
             {
-                Nca nca = new Nca(_virtualFileSystem.KeySet, OpenPossibleFragmentedFile(filesystem, entry.FullPath, OpenMode.Read).AsStorage());
+                Nca nca = new(_virtualFileSystem.KeySet, OpenPossibleFragmentedFile(filesystem, entry.FullPath, OpenMode.Read).AsStorage());
 
                 SaveNca(nca, entry.Name.Remove(entry.Name.IndexOf('.')), temporaryDirectory);
             }
@@ -575,52 +559,47 @@ namespace Ryujinx.HLE.FileSystem
             }
         }
 
-        private void InstallFromZip(ZipArchive archive, string temporaryDirectory)
+        private static void InstallFromZip(ZipArchive archive, string temporaryDirectory)
         {
-            using (archive)
+            foreach (var entry in archive.Entries)
             {
-                foreach (var entry in archive.Entries)
+                if (entry.FullName.EndsWith(".nca") || entry.FullName.EndsWith(".nca/00"))
                 {
-                    if (entry.FullName.EndsWith(".nca") || entry.FullName.EndsWith(".nca/00"))
+                    // Clean up the name and get the NcaId
+
+                    string[] pathComponents = entry.FullName.Replace(".cnmt", "").Split('/');
+
+                    string ncaId = pathComponents[^1];
+
+                    // If this is a fragmented nca, we need to get the previous element.GetZip
+                    if (ncaId.Equals("00"))
                     {
-                        // Clean up the name and get the NcaId
+                        ncaId = pathComponents[^2];
+                    }
 
-                        string[] pathComponents = entry.FullName.Replace(".cnmt", "").Split('/');
+                    if (ncaId.Contains(".nca"))
+                    {
+                        string newPath = Path.Combine(temporaryDirectory, ncaId);
 
-                        string ncaId = pathComponents[pathComponents.Length - 1];
+                        Directory.CreateDirectory(newPath);
 
-                        // If this is a fragmented nca, we need to get the previous element.GetZip
-                        if (ncaId.Equals("00"))
-                        {
-                            ncaId = pathComponents[pathComponents.Length - 2];
-                        }
-
-                        if (ncaId.Contains(".nca"))
-                        {
-                            string newPath = Path.Combine(temporaryDirectory, ncaId);
-
-                            Directory.CreateDirectory(newPath);
-
-                            entry.ExtractToFile(Path.Combine(newPath, "00"));
-                        }
+                        entry.ExtractToFile(Path.Combine(newPath, "00"));
                     }
                 }
             }
         }
 
-        public void SaveNca(Nca nca, string ncaId, string temporaryDirectory)
+        public static void SaveNca(Nca nca, string ncaId, string temporaryDirectory)
         {
             string newPath = Path.Combine(temporaryDirectory, ncaId + ".nca");
 
             Directory.CreateDirectory(newPath);
 
-            using (FileStream file = File.Create(Path.Combine(newPath, "00")))
-            {
-                nca.BaseStorage.AsStream().CopyTo(file);
-            }
+            using FileStream file = File.Create(Path.Combine(newPath, "00"));
+            nca.BaseStorage.AsStream().CopyTo(file);
         }
 
-        private IFile OpenPossibleFragmentedFile(IFileSystem filesystem, string path, OpenMode mode)
+        private static IFile OpenPossibleFragmentedFile(IFileSystem filesystem, string path, OpenMode mode)
         {
             using var file = new UniqueRef<IFile>();
 
@@ -636,14 +615,12 @@ namespace Ryujinx.HLE.FileSystem
             return file.Release();
         }
 
-        private Stream GetZipStream(ZipArchiveEntry entry)
+        private static Stream GetZipStream(ZipArchiveEntry entry)
         {
             MemoryStream dest = MemoryStreamManager.Shared.GetStream();
 
-            using (Stream src = entry.Open())
-            {
-                src.CopyTo(dest);
-            }
+            using Stream src = entry.Open();
+            src.CopyTo(dest);
 
             return dest;
         }
@@ -659,7 +636,7 @@ namespace Ryujinx.HLE.FileSystem
                 throw new MissingKeyException("HeaderKey is empty. Cannot decrypt NCA headers.");
             }
 
-            Dictionary<ulong, List<(NcaContentType type, string path)>> updateNcas = new Dictionary<ulong, List<(NcaContentType, string)>>();
+            Dictionary<ulong, List<(NcaContentType type, string path)>> updateNcas = new();
 
             if (Directory.Exists(firmwarePackage))
             {
@@ -671,33 +648,32 @@ namespace Ryujinx.HLE.FileSystem
                 throw new FileNotFoundException("Firmware file does not exist.");
             }
 
-            FileInfo info = new FileInfo(firmwarePackage);
+            FileInfo info = new(firmwarePackage);
 
-            using (FileStream file = File.OpenRead(firmwarePackage))
+            using FileStream file = File.OpenRead(firmwarePackage);
+
+            switch (info.Extension)
             {
-                switch (info.Extension)
-                {
-                    case ".zip":
-                        using (ZipArchive archive = ZipFile.OpenRead(firmwarePackage))
-                        {
-                            return VerifyAndGetVersionZip(archive);
-                        }
-                    case ".xci":
-                        Xci xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage());
+                case ".zip":
+                    using (ZipArchive archive = ZipFile.OpenRead(firmwarePackage))
+                    {
+                        return VerifyAndGetVersionZip(archive);
+                    }
+                case ".xci":
+                    Xci xci = new(_virtualFileSystem.KeySet, file.AsStorage());
 
-                        if (xci.HasPartition(XciPartitionType.Update))
-                        {
-                            XciPartition partition = xci.OpenPartition(XciPartitionType.Update);
+                    if (xci.HasPartition(XciPartitionType.Update))
+                    {
+                        XciPartition partition = xci.OpenPartition(XciPartitionType.Update);
 
-                            return VerifyAndGetVersion(partition);
-                        }
-                        else
-                        {
-                            throw new InvalidFirmwarePackageException("Update not found in xci file.");
-                        }
-                    default:
-                        break;
-                }
+                        return VerifyAndGetVersion(partition);
+                    }
+                    else
+                    {
+                        throw new InvalidFirmwarePackageException("Update not found in xci file.");
+                    }
+                default:
+                    break;
             }
 
             SystemVersion VerifyAndGetVersionDirectory(string firmwareDirectory)
@@ -713,21 +689,19 @@ namespace Ryujinx.HLE.FileSystem
                 {
                     if (entry.FullName.EndsWith(".nca") || entry.FullName.EndsWith(".nca/00"))
                     {
-                        using (Stream ncaStream = GetZipStream(entry))
+                        using Stream ncaStream = GetZipStream(entry);
+                        IStorage storage = ncaStream.AsStorage();
+
+                        Nca nca = new(_virtualFileSystem.KeySet, storage);
+
+                        if (updateNcas.TryGetValue(nca.Header.TitleId, out var updateNcasItem))
                         {
-                            IStorage storage = ncaStream.AsStorage();
-
-                            Nca nca = new Nca(_virtualFileSystem.KeySet, storage);
-
-                            if (updateNcas.TryGetValue(nca.Header.TitleId, out var updateNcasItem))
-                            {
-                                updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
-                            }
-                            else
-                            {
-                                updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
-                                updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName));
-                            }
+                            updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
+                        }
+                        else
+                        {
+                            updateNcas.Add(nca.Header.TitleId, new List<(NcaContentType, string)>());
+                            updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName));
                         }
                     }
                 }
@@ -742,7 +716,7 @@ namespace Ryujinx.HLE.FileSystem
 
                     using (Stream ncaStream = GetZipStream(fileEntry))
                     {
-                        Nca metaNca = new Nca(_virtualFileSystem.KeySet, ncaStream.AsStorage());
+                        Nca metaNca = new(_virtualFileSystem.KeySet, ncaStream.AsStorage());
 
                         IFileSystem fs = metaNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
 
@@ -772,18 +746,16 @@ namespace Ryujinx.HLE.FileSystem
                     {
                         string versionEntry = updateNcasItem.Find(x => x.type != NcaContentType.Meta).path;
 
-                        using (Stream ncaStream = GetZipStream(archive.GetEntry(versionEntry)))
+                        using Stream ncaStream = GetZipStream(archive.GetEntry(versionEntry));
+                        Nca nca = new(_virtualFileSystem.KeySet, ncaStream.AsStorage());
+
+                        var romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
+
+                        using var systemVersionFile = new UniqueRef<IFile>();
+
+                        if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
                         {
-                            Nca nca = new Nca(_virtualFileSystem.KeySet, ncaStream.AsStorage());
-
-                            var romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
-
-                            using var systemVersionFile = new UniqueRef<IFile>();
-
-                            if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
-                            {
-                                systemVersion = new SystemVersion(systemVersionFile.Get.AsStream());
-                            }
+                            systemVersion = new SystemVersion(systemVersionFile.Get.AsStream());
                         }
                     }
 
@@ -804,43 +776,39 @@ namespace Ryujinx.HLE.FileSystem
                                 continue;
                             }
 
-                            ZipArchiveEntry metaZipEntry    = archive.GetEntry(metaPath);
+                            ZipArchiveEntry metaZipEntry = archive.GetEntry(metaPath);
                             ZipArchiveEntry contentZipEntry = archive.GetEntry(contentPath);
 
-                            using (Stream metaNcaStream = GetZipStream(metaZipEntry))
+                            using Stream metaNcaStream = GetZipStream(metaZipEntry);
+                            using Stream contentNcaStream = GetZipStream(contentZipEntry);
+                            Nca metaNca = new(_virtualFileSystem.KeySet, metaNcaStream.AsStorage());
+
+                            IFileSystem fs = metaNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
+
+                            string cnmtPath = fs.EnumerateEntries("/", "*.cnmt").Single().FullPath;
+
+                            using var metaFile = new UniqueRef<IFile>();
+
+                            if (fs.OpenFile(ref metaFile.Ref, cnmtPath.ToU8Span(), OpenMode.Read).IsSuccess())
                             {
-                                using (Stream contentNcaStream = GetZipStream(contentZipEntry))
+                                var meta = new Cnmt(metaFile.Get.AsStream());
+
+                                IStorage contentStorage = contentNcaStream.AsStorage();
+                                if (contentStorage.GetSize(out long size).IsSuccess())
                                 {
-                                    Nca metaNca = new Nca(_virtualFileSystem.KeySet, metaNcaStream.AsStorage());
+                                    byte[] contentData = new byte[size];
 
-                                    IFileSystem fs = metaNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
+                                    Span<byte> content = new(contentData);
 
-                                    string cnmtPath = fs.EnumerateEntries("/", "*.cnmt").Single().FullPath;
+                                    contentStorage.Read(0, content);
 
-                                    using var metaFile = new UniqueRef<IFile>();
+                                    Span<byte> hash = new(new byte[32]);
 
-                                    if (fs.OpenFile(ref metaFile.Ref, cnmtPath.ToU8Span(), OpenMode.Read).IsSuccess())
+                                    LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash);
+
+                                    if (LibHac.Common.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash))
                                     {
-                                        var meta = new Cnmt(metaFile.Get.AsStream());
-
-                                        IStorage contentStorage = contentNcaStream.AsStorage();
-                                        if (contentStorage.GetSize(out long size).IsSuccess())
-                                        {
-                                            byte[] contentData = new byte[size];
-
-                                            Span<byte> content = new Span<byte>(contentData);
-
-                                            contentStorage.Read(0, content);
-
-                                            Span<byte> hash = new Span<byte>(new byte[32]);
-
-                                            LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash);
-
-                                            if (LibHac.Common.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash))
-                                            {
-                                                updateNcas.Remove(metaEntry.TitleId);
-                                            }
-                                        }
+                                        updateNcas.Remove(metaEntry.TitleId);
                                     }
                                 }
                             }
@@ -853,9 +821,9 @@ namespace Ryujinx.HLE.FileSystem
 
                         foreach (var entry in updateNcas)
                         {
-                            foreach (var nca in entry.Value)
+                            foreach (var (type, path) in entry.Value)
                             {
-                                extraNcas += nca.path + Environment.NewLine;
+                                extraNcas += path + Environment.NewLine;
                             }
                         }
 
@@ -880,7 +848,7 @@ namespace Ryujinx.HLE.FileSystem
                 {
                     IStorage ncaStorage = OpenPossibleFragmentedFile(filesystem, entry.FullPath, OpenMode.Read).AsStorage();
 
-                    Nca nca = new Nca(_virtualFileSystem.KeySet, ncaStorage);
+                    Nca nca = new(_virtualFileSystem.KeySet, ncaStorage);
 
                     if (nca.Header.TitleId == SystemUpdateTitleId && nca.Header.ContentType == NcaContentType.Meta)
                     {
@@ -936,8 +904,8 @@ namespace Ryujinx.HLE.FileSystem
                 {
                     if (updateNcas.TryGetValue(metaEntry.TitleId, out var ncaEntry))
                     {
-                        var    metaNcaEntry = ncaEntry.Find(x => x.type == NcaContentType.Meta);
-                        string contentPath  = ncaEntry.Find(x => x.type != NcaContentType.Meta).path;
+                        string metaNcaPath = ncaEntry.Find(x => x.type == NcaContentType.Meta).path;
+                        string contentPath = ncaEntry.Find(x => x.type != NcaContentType.Meta).path;
 
                         // Nintendo in 9.0.0, removed PPC and only kept the meta nca of it.
                         // This is a perfect valid case, so we should just ignore the missing content nca and continue.
@@ -948,10 +916,10 @@ namespace Ryujinx.HLE.FileSystem
                             continue;
                         }
 
-                        IStorage metaStorage = OpenPossibleFragmentedFile(filesystem, metaNcaEntry.path, OpenMode.Read).AsStorage();
+                        IStorage metaStorage = OpenPossibleFragmentedFile(filesystem, metaNcaPath, OpenMode.Read).AsStorage();
                         IStorage contentStorage = OpenPossibleFragmentedFile(filesystem, contentPath, OpenMode.Read).AsStorage();
 
-                        Nca metaNca = new Nca(_virtualFileSystem.KeySet, metaStorage);
+                        Nca metaNca = new(_virtualFileSystem.KeySet, metaStorage);
 
                         IFileSystem fs = metaNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
 
@@ -967,11 +935,11 @@ namespace Ryujinx.HLE.FileSystem
                             {
                                 byte[] contentData = new byte[size];
 
-                                Span<byte> content = new Span<byte>(contentData);
+                                Span<byte> content = new(contentData);
 
                                 contentStorage.Read(0, content);
 
-                                Span<byte> hash = new Span<byte>(new byte[32]);
+                                Span<byte> hash = new(new byte[32]);
 
                                 LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash);
 
@@ -1017,24 +985,21 @@ namespace Ryujinx.HLE.FileSystem
                 {
                     if (entry.ContentType == NcaContentType.Data)
                     {
-                        var path = _virtualFileSystem.SwitchPathToSystemPath(entry.ContentPath);
+                        var path = VirtualFileSystem.SwitchPathToSystemPath(entry.ContentPath);
 
-                        using (FileStream fileStream = File.OpenRead(path))
+                        using FileStream fileStream = File.OpenRead(path);
+                        Nca nca = new(_virtualFileSystem.KeySet, fileStream.AsStorage());
+
+                        if (nca.Header.TitleId == SystemVersionTitleId && nca.Header.ContentType == NcaContentType.Data)
                         {
-                            Nca nca = new Nca(_virtualFileSystem.KeySet, fileStream.AsStorage());
+                            var romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
 
-                            if (nca.Header.TitleId == SystemVersionTitleId && nca.Header.ContentType == NcaContentType.Data)
+                            using var systemVersionFile = new UniqueRef<IFile>();
+
+                            if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
                             {
-                                var romfs = nca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.ErrorOnInvalid);
-
-                                using var systemVersionFile = new UniqueRef<IFile>();
-
-                                if (romfs.OpenFile(ref systemVersionFile.Ref, "/file".ToU8Span(), OpenMode.Read).IsSuccess())
-                                {
-                                    return new SystemVersion(systemVersionFile.Get.AsStream());
-                                }
+                                return new SystemVersion(systemVersionFile.Get.AsStream());
                             }
-
                         }
                     }
                 }

src/Ryujinx.HLE/FileSystem/ContentPath.cs

@@ -2,7 +2,6 @@
 using LibHac.Ncm;
 using Ryujinx.Common.Configuration;
 using System;
-
 using static Ryujinx.HLE.FileSystem.VirtualFileSystem;
 using Path = System.IO.Path;
 
@@ -10,33 +9,33 @@ namespace Ryujinx.HLE.FileSystem
 {
     internal static class ContentPath
     {
-        public const string SystemContent    = "@SystemContent";
-        public const string UserContent      = "@UserContent";
-        public const string SdCardContent    = "@SdCardContent";
-        public const string SdCard           = "@Sdcard";
-        public const string CalibFile        = "@CalibFile";
-        public const string Safe             = "@Safe";
-        public const string User             = "@User";
-        public const string System           = "@System";
-        public const string Host             = "@Host";
-        public const string GamecardApp      = "@GcApp";
+        public const string SystemContent = "@SystemContent";
+        public const string UserContent = "@UserContent";
+        public const string SdCardContent = "@SdCardContent";
+        public const string SdCard = "@Sdcard";
+        public const string CalibFile = "@CalibFile";
+        public const string Safe = "@Safe";
+        public const string User = "@User";
+        public const string System = "@System";
+        public const string Host = "@Host";
+        public const string GamecardApp = "@GcApp";
         public const string GamecardContents = "@GcS00000001";
-        public const string GamecardUpdate   = "@upp";
+        public const string GamecardUpdate = "@upp";
         public const string RegisteredUpdate = "@RegUpdate";
 
         public const string Nintendo = "Nintendo";
         public const string Contents = "Contents";
 
-        public static string GetRealPath(VirtualFileSystem fileSystem, string switchContentPath)
+        public static string GetRealPath(string switchContentPath)
         {
             return switchContentPath switch
             {
                 SystemContent => Path.Combine(AppDataManager.BaseDirPath, SystemNandPath, Contents),
-                UserContent   => Path.Combine(AppDataManager.BaseDirPath, UserNandPath,   Contents),
-                SdCardContent => Path.Combine(fileSystem.GetSdCardPath(), Nintendo,       Contents),
-                System        => Path.Combine(AppDataManager.BaseDirPath, SystemNandPath),
-                User          => Path.Combine(AppDataManager.BaseDirPath, UserNandPath),
-                _ => throw new NotSupportedException($"Content Path \"`{switchContentPath}`\" is not supported.")
+                UserContent => Path.Combine(AppDataManager.BaseDirPath, UserNandPath, Contents),
+                SdCardContent => Path.Combine(GetSdCardPath(), Nintendo, Contents),
+                System => Path.Combine(AppDataManager.BaseDirPath, SystemNandPath),
+                User => Path.Combine(AppDataManager.BaseDirPath, UserNandPath),
+                _ => throw new NotSupportedException($"Content Path \"`{switchContentPath}`\" is not supported."),
             };
         }
 
@@ -45,9 +44,9 @@ namespace Ryujinx.HLE.FileSystem
             return contentStorageId switch
             {
                 ContentStorageId.System => SystemContent,
-                ContentStorageId.User   => UserContent,
+                ContentStorageId.User => UserContent,
                 ContentStorageId.SdCard => SdCardContent,
-                _ => throw new NotSupportedException($"Content Storage Id \"`{contentStorageId}`\" is not supported.")
+                _ => throw new NotSupportedException($"Content Storage Id \"`{contentStorageId}`\" is not supported."),
             };
         }
 
@@ -56,9 +55,9 @@ namespace Ryujinx.HLE.FileSystem
             return storageId switch
             {
                 StorageId.BuiltInSystem => SystemContent,
-                StorageId.BuiltInUser   => UserContent,
-                StorageId.SdCard        => SdCardContent,
-                _ => throw new NotSupportedException($"Storage Id \"`{storageId}`\" is not supported.")
+                StorageId.BuiltInUser => UserContent,
+                StorageId.SdCard => SdCardContent,
+                _ => throw new NotSupportedException($"Storage Id \"`{storageId}`\" is not supported."),
             };
         }
 
@@ -67,16 +66,16 @@ namespace Ryujinx.HLE.FileSystem
             return contentPathString.Split(':')[0] switch
             {
                 SystemContent or
-                System         => StorageId.BuiltInSystem,
+                System => StorageId.BuiltInSystem,
                 UserContent or
-                User           => StorageId.BuiltInUser,
-                SdCardContent  => StorageId.SdCard,
-                Host           => StorageId.Host,
+                User => StorageId.BuiltInUser,
+                SdCardContent => StorageId.SdCard,
+                Host => StorageId.Host,
                 GamecardApp or
                 GamecardContents or
                 GamecardUpdate => StorageId.GameCard,
-                _              => StorageId.None
+                _ => StorageId.None,
             };
         }
     }
-}
+}

src/Ryujinx.HLE/FileSystem/EncryptedFileSystemCreator.cs

@@ -23,4 +23,4 @@ namespace Ryujinx.HLE.FileSystem
             return Result.Success;
         }
     }
-}
+}

src/Ryujinx.HLE/FileSystem/LocationEntry.cs

@@ -4,16 +4,16 @@ namespace Ryujinx.HLE.FileSystem
 {
     public struct LocationEntry
     {
-        public string         ContentPath { get; private set; }
-        public int            Flag        { get; private set; }
-        public ulong          TitleId     { get; private set; }
+        public string ContentPath { get; private set; }
+        public int Flag { get; private set; }
+        public ulong TitleId { get; private set; }
         public NcaContentType ContentType { get; private set; }
 
         public LocationEntry(string contentPath, int flag, ulong titleId, NcaContentType contentType)
         {
             ContentPath = contentPath;
-            Flag        = flag;
-            TitleId     = titleId;
+            Flag = flag;
+            TitleId = titleId;
             ContentType = contentType;
         }
 

src/Ryujinx.HLE/FileSystem/SystemVersion.cs

@@ -5,36 +5,34 @@ namespace Ryujinx.HLE.FileSystem
 {
     public class SystemVersion
     {
-        public byte   Major          { get; }
-        public byte   Minor          { get; }
-        public byte   Micro          { get; }
-        public byte   RevisionMajor  { get; }
-        public byte   RevisionMinor  { get; }
+        public byte Major { get; }
+        public byte Minor { get; }
+        public byte Micro { get; }
+        public byte RevisionMajor { get; }
+        public byte RevisionMinor { get; }
         public string PlatformString { get; }
-        public string Hex            { get; }
-        public string VersionString  { get; }
-        public string VersionTitle   { get; }
+        public string Hex { get; }
+        public string VersionString { get; }
+        public string VersionTitle { get; }
 
         public SystemVersion(Stream systemVersionFile)
         {
-            using (BinaryReader reader = new BinaryReader(systemVersionFile))
-            {
-                Major = reader.ReadByte();
-                Minor = reader.ReadByte();
-                Micro = reader.ReadByte();
+            using BinaryReader reader = new(systemVersionFile);
+            Major = reader.ReadByte();
+            Minor = reader.ReadByte();
+            Micro = reader.ReadByte();
 
-                reader.ReadByte(); // Padding
+            reader.ReadByte(); // Padding
 
-                RevisionMajor = reader.ReadByte();
-                RevisionMinor = reader.ReadByte();
+            RevisionMajor = reader.ReadByte();
+            RevisionMinor = reader.ReadByte();
 
-                reader.ReadBytes(2); // Padding
+            reader.ReadBytes(2); // Padding
 
-                PlatformString = StringUtils.ReadInlinedAsciiString(reader, 0x20);
-                Hex            = StringUtils.ReadInlinedAsciiString(reader, 0x40);
-                VersionString  = StringUtils.ReadInlinedAsciiString(reader, 0x18);
-                VersionTitle   = StringUtils.ReadInlinedAsciiString(reader, 0x80);
-            }
+            PlatformString = StringUtils.ReadInlinedAsciiString(reader, 0x20);
+            Hex = StringUtils.ReadInlinedAsciiString(reader, 0x40);
+            VersionString = StringUtils.ReadInlinedAsciiString(reader, 0x18);
+            VersionTitle = StringUtils.ReadInlinedAsciiString(reader, 0x80);
         }
     }
-}
+}

src/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs

@@ -26,14 +26,14 @@ namespace Ryujinx.HLE.FileSystem
 {
     public class VirtualFileSystem : IDisposable
     {
-        public static string SafeNandPath   = Path.Combine(AppDataManager.DefaultNandDir, "safe");
-        public static string SystemNandPath = Path.Combine(AppDataManager.DefaultNandDir, "system");
-        public static string UserNandPath   = Path.Combine(AppDataManager.DefaultNandDir, "user");
+        public static readonly string SafeNandPath = Path.Combine(AppDataManager.DefaultNandDir, "safe");
+        public static readonly string SystemNandPath = Path.Combine(AppDataManager.DefaultNandDir, "system");
+        public static readonly string UserNandPath = Path.Combine(AppDataManager.DefaultNandDir, "user");
 
-        public KeySet           KeySet    { get; private set; }
-        public EmulatedGameCard GameCard  { get; private set; }
-        public EmulatedSdCard   SdCard    { get; private set; }
-        public ModLoader        ModLoader { get; private set; }
+        public KeySet KeySet { get; private set; }
+        public EmulatedGameCard GameCard { get; private set; }
+        public EmulatedSdCard SdCard { get; private set; }
+        public ModLoader ModLoader { get; private set; }
 
         private readonly ConcurrentDictionary<ulong, Stream> _romFsByPid;
 
@@ -85,15 +85,15 @@ namespace Ryujinx.HLE.FileSystem
             return _romFsByPid[pid];
         }
 
-        public string GetFullPath(string basePath, string fileName)
+        public static string GetFullPath(string basePath, string fileName)
         {
             if (fileName.StartsWith("//"))
             {
-                fileName = fileName.Substring(2);
+                fileName = fileName[2..];
             }
             else if (fileName.StartsWith('/'))
             {
-                fileName = fileName.Substring(1);
+                fileName = fileName[1..];
             }
             else
             {
@@ -110,10 +110,10 @@ namespace Ryujinx.HLE.FileSystem
             return fullPath;
         }
 
-        internal string GetSdCardPath() => MakeFullPath(AppDataManager.DefaultSdcardDir);
-        public string GetNandPath() => MakeFullPath(AppDataManager.DefaultNandDir);
+        internal static string GetSdCardPath() => MakeFullPath(AppDataManager.DefaultSdcardDir);
+        public static string GetNandPath() => MakeFullPath(AppDataManager.DefaultNandDir);
 
-        public string SwitchPathToSystemPath(string switchPath)
+        public static string SwitchPathToSystemPath(string switchPath)
         {
             string[] parts = switchPath.Split(":");
 
@@ -125,7 +125,7 @@ namespace Ryujinx.HLE.FileSystem
             return GetFullPath(MakeFullPath(parts[0]), parts[1]);
         }
 
-        public string SystemPathToSwitchPath(string systemPath)
+        public static string SystemPathToSwitchPath(string systemPath)
         {
             string baseSystemPath = AppDataManager.BaseDirPath + Path.DirectorySeparatorChar;
 
@@ -148,7 +148,7 @@ namespace Ryujinx.HLE.FileSystem
             return null;
         }
 
-        private string MakeFullPath(string path, bool isDirectory = true)
+        private static string MakeFullPath(string path, bool isDirectory = true)
         {
             // Handles Common Switch Content Paths
             switch (path)
@@ -185,7 +185,7 @@ namespace Ryujinx.HLE.FileSystem
 
         public void InitializeFsServer(LibHac.Horizon horizon, out HorizonClient fsServerClient)
         {
-            LocalFileSystem serverBaseFs = new LocalFileSystem(AppDataManager.BaseDirPath);
+            LocalFileSystem serverBaseFs = new(AppDataManager.BaseDirPath);
 
             fsServerClient = horizon.CreatePrivilegedHorizonClient();
             var fsServer = new FileSystemServer(fsServerClient);
@@ -207,7 +207,7 @@ namespace Ryujinx.HLE.FileSystem
                 DeviceOperator = fsServerObjects.DeviceOperator,
                 ExternalKeySet = KeySet.ExternalKeySet,
                 FsCreators = fsServerObjects.FsCreators,
-                RandomGenerator = randomGenerator
+                RandomGenerator = randomGenerator,
             };
 
             FileSystemServerInitializer.InitializeWithConfig(fsServerClient, fsServer, fsServerConfig);
@@ -282,16 +282,28 @@ namespace Ryujinx.HLE.FileSystem
         public static Result FixExtraData(HorizonClient hos)
         {
             Result rc = GetSystemSaveList(hos, out List<ulong> systemSaveIds);
-            if (rc.IsFailure()) return rc;
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
 
             rc = FixUnindexedSystemSaves(hos, systemSaveIds);
-            if (rc.IsFailure()) return rc;
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
 
             rc = FixExtraDataInSpaceId(hos, SaveDataSpaceId.System);
-            if (rc.IsFailure()) return rc;
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
 
             rc = FixExtraDataInSpaceId(hos, SaveDataSpaceId.User);
-            if (rc.IsFailure()) return rc;
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
 
             return Result.Success;
         }
@@ -303,15 +315,23 @@ namespace Ryujinx.HLE.FileSystem
             using var iterator = new UniqueRef<SaveDataIterator>();
 
             Result rc = hos.Fs.OpenSaveDataIterator(ref iterator.Ref, spaceId);
-            if (rc.IsFailure()) return rc;
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
 
             while (true)
             {
                 rc = iterator.Get.ReadSaveDataInfo(out long count, info);
-                if (rc.IsFailure()) return rc;
+                if (rc.IsFailure())
+                {
+                    return rc;
+                }
 
                 if (count == 0)
+                {
                     return Result.Success;
+                }
 
                 for (int i = 0; i < count; i++)
                 {
@@ -351,7 +371,9 @@ namespace Ryujinx.HLE.FileSystem
         private static Result CreateSaveDataDirectory(HorizonClient hos, in SaveDataInfo info)
         {
             if (info.SpaceId != SaveDataSpaceId.User && info.SpaceId != SaveDataSpaceId.System)
+            {
                 return Result.Success;
+            }
 
             const string MountName = "SaveDir";
             var mountNameU8 = MountName.ToU8Span();
@@ -360,11 +382,15 @@ namespace Ryujinx.HLE.FileSystem
             {
                 SaveDataSpaceId.System => BisPartitionId.System,
                 SaveDataSpaceId.User => BisPartitionId.User,
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new ArgumentOutOfRangeException(nameof(info), info.SpaceId, null),
             };
 
             Result rc = hos.Fs.MountBis(mountNameU8, partitionId);
-            if (rc.IsFailure()) return rc;
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
+
             try
             {
                 var path = $"{MountName}:/save/{info.SaveDataId:x16}".ToU8Span();
@@ -391,28 +417,38 @@ namespace Ryujinx.HLE.FileSystem
 
             var mountName = "system".ToU8Span();
             DirectoryHandle handle = default;
-            List<ulong> localList = new List<ulong>();
+            List<ulong> localList = new();
 
             try
             {
                 Result rc = hos.Fs.MountBis(mountName, BisPartitionId.System);
-                if (rc.IsFailure()) return rc;
+                if (rc.IsFailure())
+                {
+                    return rc;
+                }
 
                 rc = hos.Fs.OpenDirectory(out handle, "system:/save".ToU8Span(), OpenDirectoryMode.All);
-                if (rc.IsFailure()) return rc;
+                if (rc.IsFailure())
+                {
+                    return rc;
+                }
 
-                DirectoryEntry entry = new DirectoryEntry();
+                DirectoryEntry entry = new();
 
                 while (true)
                 {
                     rc = hos.Fs.ReadDirectory(out long readCount, SpanHelpers.AsSpan(ref entry), handle);
-                    if (rc.IsFailure()) return rc;
+                    if (rc.IsFailure())
+                    {
+                        return rc;
+                    }
 
                     if (readCount == 0)
+                    {
                         break;
+                    }
 
-                    if (Utf8Parser.TryParse(entry.Name, out ulong saveDataId, out int bytesRead, 'x') &&
-                        bytesRead == 16 && (long)saveDataId < 0)
+                    if (Utf8Parser.TryParse(entry.Name, out ulong saveDataId, out int bytesRead, 'x') && bytesRead == 16 && (long)saveDataId < 0)
                     {
                         localList.Add(saveDataId);
                     }
@@ -440,7 +476,7 @@ namespace Ryujinx.HLE.FileSystem
         // Only save data IDs added to SystemExtraDataFixInfo will be fixed.
         private static Result FixUnindexedSystemSaves(HorizonClient hos, List<ulong> existingSaveIds)
         {
-            foreach (var fixInfo in SystemExtraDataFixInfo)
+            foreach (var fixInfo in _systemExtraDataFixInfo)
             {
                 if (!existingSaveIds.Contains(fixInfo.StaticSaveDataId))
                 {
@@ -472,7 +508,9 @@ namespace Ryujinx.HLE.FileSystem
             if (!rc.IsSuccess())
             {
                 if (!ResultFs.TargetNotFound.Includes(rc))
+                {
                     return rc;
+                }
 
                 // We'll reach this point only if the save data directory exists but it's not in the save data indexer.
                 // Creating the save will add it to the indexer while leaving its existing contents intact.
@@ -492,7 +530,7 @@ namespace Ryujinx.HLE.FileSystem
                 OwnerId = info.OwnerId,
                 Flags = info.Flags,
                 DataSize = info.DataSize,
-                JournalSize = info.JournalSize
+                JournalSize = info.JournalSize,
             };
 
             // Make a mask for writing the entire extra data
@@ -507,9 +545,11 @@ namespace Ryujinx.HLE.FileSystem
         {
             wasFixNeeded = true;
 
-            Result rc = hos.Fs.Impl.ReadSaveDataFileSystemExtraData(out SaveDataExtraData extraData, info.SpaceId,
-                info.SaveDataId);
-            if (rc.IsFailure()) return rc;
+            Result rc = hos.Fs.Impl.ReadSaveDataFileSystemExtraData(out SaveDataExtraData extraData, info.SpaceId, info.SaveDataId);
+            if (rc.IsFailure())
+            {
+                return rc;
+            }
 
             // The extra data should have program ID or static save data ID set if it's valid.
             // We only try to fix the extra data if the info from the save data indexer has a program ID or static save data ID.
@@ -543,7 +583,7 @@ namespace Ryujinx.HLE.FileSystem
             else
             {
                 // Try to match the system save with one of the known saves
-                foreach (ExtraDataFixInfo fixInfo in SystemExtraDataFixInfo)
+                foreach (ExtraDataFixInfo fixInfo in _systemExtraDataFixInfo)
                 {
                     if (extraData.Attribute.StaticSaveDataId == fixInfo.StaticSaveDataId)
                     {
@@ -573,7 +613,7 @@ namespace Ryujinx.HLE.FileSystem
             public long JournalSize;
         }
 
-        private static readonly ExtraDataFixInfo[] SystemExtraDataFixInfo =
+        private static readonly ExtraDataFixInfo[] _systemExtraDataFixInfo =
         {
             new ExtraDataFixInfo()
             {
@@ -581,7 +621,7 @@ namespace Ryujinx.HLE.FileSystem
                 OwnerId = 0x010000000000001F,
                 Flags = SaveDataFlags.KeepAfterResettingSystemSaveDataWithoutUserSaveData,
                 DataSize = 0x10000,
-                JournalSize = 0x10000
+                JournalSize = 0x10000,
             },
             new ExtraDataFixInfo()
             {
@@ -589,12 +629,13 @@ namespace Ryujinx.HLE.FileSystem
                 OwnerId = 0x0100000000001009,
                 Flags = SaveDataFlags.None,
                 DataSize = 0xC000,
-                JournalSize = 0xC000
-            }
+                JournalSize = 0xC000,
+            },
         };
 
         public void Dispose()
         {
+            GC.SuppressFinalize(this);
             Dispose(true);
         }
 

src/Ryujinx.HLE/HLEConfiguration.cs

@@ -163,57 +163,57 @@ namespace Ryujinx.HLE
         /// </summary>
         public Action RefreshInputConfig { internal get; set; }
 
-        public HLEConfiguration(VirtualFileSystem      virtualFileSystem,
-                                LibHacHorizonManager   libHacHorizonManager,
-                                ContentManager         contentManager,
-                                AccountManager         accountManager,
+        public HLEConfiguration(VirtualFileSystem virtualFileSystem,
+                                LibHacHorizonManager libHacHorizonManager,
+                                ContentManager contentManager,
+                                AccountManager accountManager,
                                 UserChannelPersistence userChannelPersistence,
-                                IRenderer              gpuRenderer,
-                                IHardwareDeviceDriver  audioDeviceDriver,
-                                MemoryConfiguration    memoryConfiguration,
-                                IHostUiHandler         hostUiHandler,
-                                SystemLanguage         systemLanguage,
-                                RegionCode             region,
-                                bool                   enableVsync,
-                                bool                   enableDockedMode,
-                                bool                   enablePtc,
-                                bool                   enableInternetAccess,
-                                IntegrityCheckLevel    fsIntegrityCheckLevel,
-                                int                    fsGlobalAccessLogMode,
-                                long                   systemTimeOffset,
-                                string                 timeZone,
-                                MemoryManagerMode      memoryManagerMode,
-                                bool                   ignoreMissingServices,
-                                AspectRatio            aspectRatio,
-                                float                  audioVolume,
-                                bool                   useHypervisor,
-                                string                 multiplayerLanInterfaceId)
+                                IRenderer gpuRenderer,
+                                IHardwareDeviceDriver audioDeviceDriver,
+                                MemoryConfiguration memoryConfiguration,
+                                IHostUiHandler hostUiHandler,
+                                SystemLanguage systemLanguage,
+                                RegionCode region,
+                                bool enableVsync,
+                                bool enableDockedMode,
+                                bool enablePtc,
+                                bool enableInternetAccess,
+                                IntegrityCheckLevel fsIntegrityCheckLevel,
+                                int fsGlobalAccessLogMode,
+                                long systemTimeOffset,
+                                string timeZone,
+                                MemoryManagerMode memoryManagerMode,
+                                bool ignoreMissingServices,
+                                AspectRatio aspectRatio,
+                                float audioVolume,
+                                bool useHypervisor,
+                                string multiplayerLanInterfaceId)
         {
-            VirtualFileSystem         = virtualFileSystem;
-            LibHacHorizonManager      = libHacHorizonManager;
-            AccountManager            = accountManager;
-            ContentManager            = contentManager;
-            UserChannelPersistence    = userChannelPersistence;
-            GpuRenderer               = gpuRenderer;
-            AudioDeviceDriver         = audioDeviceDriver;
-            MemoryConfiguration       = memoryConfiguration;
-            HostUiHandler             = hostUiHandler;
-            SystemLanguage            = systemLanguage;
-            Region                    = region;
-            EnableVsync               = enableVsync;
-            EnableDockedMode          = enableDockedMode;
-            EnablePtc                 = enablePtc;
-            EnableInternetAccess      = enableInternetAccess;
-            FsIntegrityCheckLevel     = fsIntegrityCheckLevel;
-            FsGlobalAccessLogMode     = fsGlobalAccessLogMode;
-            SystemTimeOffset          = systemTimeOffset;
-            TimeZone                  = timeZone;
-            MemoryManagerMode         = memoryManagerMode;
-            IgnoreMissingServices     = ignoreMissingServices;
-            AspectRatio               = aspectRatio;
-            AudioVolume               = audioVolume;
-            UseHypervisor             = useHypervisor;
+            VirtualFileSystem = virtualFileSystem;
+            LibHacHorizonManager = libHacHorizonManager;
+            AccountManager = accountManager;
+            ContentManager = contentManager;
+            UserChannelPersistence = userChannelPersistence;
+            GpuRenderer = gpuRenderer;
+            AudioDeviceDriver = audioDeviceDriver;
+            MemoryConfiguration = memoryConfiguration;
+            HostUiHandler = hostUiHandler;
+            SystemLanguage = systemLanguage;
+            Region = region;
+            EnableVsync = enableVsync;
+            EnableDockedMode = enableDockedMode;
+            EnablePtc = enablePtc;
+            EnableInternetAccess = enableInternetAccess;
+            FsIntegrityCheckLevel = fsIntegrityCheckLevel;
+            FsGlobalAccessLogMode = fsGlobalAccessLogMode;
+            SystemTimeOffset = systemTimeOffset;
+            TimeZone = timeZone;
+            MemoryManagerMode = memoryManagerMode;
+            IgnoreMissingServices = ignoreMissingServices;
+            AspectRatio = aspectRatio;
+            AudioVolume = audioVolume;
+            UseHypervisor = useHypervisor;
             MultiplayerLanInterfaceId = multiplayerLanInterfaceId;
         }
     }
-}
+}

src/Ryujinx.HLE/HOS/Applets/AppletManager.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Applets
 {
     static class AppletManager
     {
-        private static Dictionary<AppletId, Type> _appletMapping;
+        private static readonly Dictionary<AppletId, Type> _appletMapping;
 
         static AppletManager()
         {
@@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Applets
                 { AppletId.SoftwareKeyboard, typeof(SoftwareKeyboardApplet) },
                 { AppletId.LibAppletWeb,     typeof(BrowserApplet)          },
                 { AppletId.LibAppletShop,    typeof(BrowserApplet)          },
-                { AppletId.LibAppletOff,     typeof(BrowserApplet)          }
+                { AppletId.LibAppletOff,     typeof(BrowserApplet)          },
             };
         }
 

src/Ryujinx.HLE/HOS/Applets/Browser/BootDisplayKind.cs

@@ -6,6 +6,6 @@
         Offline,
         Black,
         Share,
-        Lobby
+        Lobby,
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/BrowserApplet.cs

@@ -13,13 +13,12 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
         public event EventHandler AppletStateChanged;
 
         private AppletSession _normalSession;
-        private AppletSession _interactiveSession;
 
         private CommonArguments _commonArguments;
         private List<BrowserArgument> _arguments;
         private ShimKind _shimKind;
 
-        public BrowserApplet(Horizon system) {}
+        public BrowserApplet(Horizon system) { }
 
         public ResultCode GetResult()
         {
@@ -29,7 +28,6 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
         public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
         {
             _normalSession = normalSession;
-            _interactiveSession = interactiveSession;
 
             _commonArguments = IApplet.ReadStruct<CommonArguments>(_normalSession.Pop());
 
@@ -48,17 +46,18 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
 
             if ((_commonArguments.AppletVersion >= 0x80000 && _shimKind == ShimKind.Web) || (_commonArguments.AppletVersion >= 0x30000 && _shimKind == ShimKind.Share))
             {
-                List<BrowserOutput> result = new List<BrowserOutput>();
-
-                result.Add(new BrowserOutput(BrowserOutputType.ExitReason, (uint)WebExitReason.ExitButton));
+                List<BrowserOutput> result = new()
+                {
+                    new BrowserOutput(BrowserOutputType.ExitReason, (uint)WebExitReason.ExitButton),
+                };
 
                 _normalSession.Push(BuildResponseNew(result));
             }
             else
             {
-                WebCommonReturnValue result = new WebCommonReturnValue()
+                WebCommonReturnValue result = new()
                 {
-                    ExitReason  = WebExitReason.ExitButton,
+                    ExitReason = WebExitReason.ExitButton,
                 };
 
                 _normalSession.Push(BuildResponseOld(result));
@@ -69,36 +68,32 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
             return ResultCode.Success;
         }
 
-        private byte[] BuildResponseOld(WebCommonReturnValue result)
+        private static byte[] BuildResponseOld(WebCommonReturnValue result)
         {
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                writer.WriteStruct(result);
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            writer.WriteStruct(result);
 
-                return stream.ToArray();
-            }
+            return stream.ToArray();
         }
         private byte[] BuildResponseNew(List<BrowserOutput> outputArguments)
         {
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+            writer.WriteStruct(new WebArgHeader
             {
-                writer.WriteStruct(new WebArgHeader
-                {
-                    Count    = (ushort)outputArguments.Count,
-                    ShimKind = _shimKind
-                });
+                Count = (ushort)outputArguments.Count,
+                ShimKind = _shimKind,
+            });
 
-                foreach (BrowserOutput output in outputArguments)
-                {
-                    output.Write(writer);
-                }
-
-                writer.Write(new byte[0x2000 - writer.BaseStream.Position]);
-
-                return stream.ToArray();
+            foreach (BrowserOutput output in outputArguments)
+            {
+                output.Write(writer);
             }
+
+            writer.Write(new byte[0x2000 - writer.BaseStream.Position]);
+
+            return stream.ToArray();
         }
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/BrowserArgument.cs

@@ -8,16 +8,16 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
 {
     class BrowserArgument
     {
-        public WebArgTLVType Type  { get; }
-        public byte[]        Value { get; }
+        public WebArgTLVType Type { get; }
+        public byte[] Value { get; }
 
         public BrowserArgument(WebArgTLVType type, byte[] value)
         {
-            Type  = type;
+            Type = type;
             Value = value;
         }
 
-        private static readonly Dictionary<WebArgTLVType, Type> _typeRegistry = new Dictionary<WebArgTLVType, Type>
+        private static readonly Dictionary<WebArgTLVType, Type> _typeRegistry = new()
         {
             { WebArgTLVType.InitialURL,                     typeof(string) },
             { WebArgTLVType.CallbackUrl,                    typeof(string) },
@@ -64,11 +64,11 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
 
         public static (ShimKind, List<BrowserArgument>) ParseArguments(ReadOnlySpan<byte> data)
         {
-            List<BrowserArgument> browserArguments = new List<BrowserArgument>();
+            List<BrowserArgument> browserArguments = new();
 
-            WebArgHeader header = IApplet.ReadStruct<WebArgHeader>(data.Slice(0, 8));
+            WebArgHeader header = IApplet.ReadStruct<WebArgHeader>(data[..8]);
 
-            ReadOnlySpan<byte> rawTLVs = data.Slice(8);
+            ReadOnlySpan<byte> rawTLVs = data[8..];
 
             for (int i = 0; i < header.Count; i++)
             {
@@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
 
                 browserArguments.Add(new BrowserArgument((WebArgTLVType)tlv.Type, tlvData.ToArray()));
 
-                rawTLVs = rawTLVs.Slice(Unsafe.SizeOf<WebArgTLV>() + tlv.Size);
+                rawTLVs = rawTLVs[(Unsafe.SizeOf<WebArgTLV>() + tlv.Size)..];
             }
 
             return (header.ShimKind, browserArguments);

src/Ryujinx.HLE/HOS/Applets/Browser/BrowserOutput.cs

@@ -11,25 +11,25 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
 
         public BrowserOutput(BrowserOutputType type, byte[] value)
         {
-            Type  = type;
+            Type = type;
             Value = value;
         }
 
         public BrowserOutput(BrowserOutputType type, uint value)
         {
-            Type  = type;
-            Value = BitConverter.GetBytes(value); 
+            Type = type;
+            Value = BitConverter.GetBytes(value);
         }
 
         public BrowserOutput(BrowserOutputType type, ulong value)
         {
-            Type  = type;
+            Type = type;
             Value = BitConverter.GetBytes(value);
         }
 
         public BrowserOutput(BrowserOutputType type, bool value)
         {
-            Type  = type;
+            Type = type;
             Value = BitConverter.GetBytes(value);
         }
 
@@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
             writer.WriteStruct(new WebArgTLV
             {
                 Type = (ushort)Type,
-                Size = (ushort)Value.Length
+                Size = (ushort)Value.Length,
             });
 
             writer.Write(Value);

src/Ryujinx.HLE/HOS/Applets/Browser/BrowserOutputType.cs

@@ -2,13 +2,13 @@
 {
     enum BrowserOutputType : ushort
     {
-        ExitReason                        = 0x1,
-        LastUrl                           = 0x2,
-        LastUrlSize                       = 0x3,
-        SharePostResult                   = 0x4,
-        PostServiceName                   = 0x5,
-        PostServiceNameSize               = 0x6,
-        PostId                            = 0x7,
-        MediaPlayerAutoClosedByCompletion = 0x8
+        ExitReason = 0x1,
+        LastUrl = 0x2,
+        LastUrlSize = 0x3,
+        SharePostResult = 0x4,
+        PostServiceName = 0x5,
+        PostServiceNameSize = 0x6,
+        PostId = 0x7,
+        MediaPlayerAutoClosedByCompletion = 0x8,
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/DocumentKind.cs

@@ -4,6 +4,6 @@
     {
         OfflineHtmlPage = 1,
         ApplicationLegalInformation,
-        SystemDataPage
+        SystemDataPage,
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/LeftStickMode.cs

@@ -3,6 +3,6 @@
     enum LeftStickMode
     {
         Pointer = 0,
-        Cursor
+        Cursor,
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/ShimKind.cs

@@ -8,6 +8,6 @@
         Share,
         Web,
         Wifi,
-        Lobby
+        Lobby,
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/WebArgHeader.cs

@@ -2,8 +2,8 @@
 {
     public struct WebArgHeader
     {
-        public ushort   Count;
-        public ushort   Padding;
+        public ushort Count;
+        public ushort Padding;
         public ShimKind ShimKind;
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/WebArgTLV.cs

@@ -4,6 +4,6 @@
     {
         public ushort Type;
         public ushort Size;
-        public uint   Padding;
+        public uint Padding;
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/WebArgTLVType.cs

@@ -2,61 +2,61 @@
 {
     enum WebArgTLVType : ushort
     {
-        InitialURL                       = 0x1,
-        CallbackUrl                      = 0x3,
-        CallbackableUrl                  = 0x4,
-        ApplicationId                    = 0x5,
-        DocumentPath                     = 0x6,
-        DocumentKind                     = 0x7,
-        SystemDataId                     = 0x8,
-        ShareStartPage                   = 0x9,
-        Whitelist                        = 0xA,
-        NewsFlag                         = 0xB,
-        UserID                           = 0xE,
-        AlbumEntry0                      = 0xF,
-        ScreenShotEnabled                = 0x10,
-        EcClientCertEnabled              = 0x11,
-        PlayReportEnabled                = 0x13,
-        UnknownFlag0x14                  = 0x14,
-        UnknownFlag0x15                  = 0x15,
-        BootDisplayKind                  = 0x17,
-        BackgroundKind                   = 0x18,
-        FooterEnabled                    = 0x19,
-        PointerEnabled                   = 0x1A,
-        LeftStickMode                    = 0x1B,
-        KeyRepeatFrame1                  = 0x1C,
-        KeyRepeatFrame2                  = 0x1D,
-        BootAsMediaPlayerInverted        = 0x1E,
-        DisplayUrlKind                   = 0x1F,
-        BootAsMediaPlayer                = 0x21,
-        ShopJumpEnabled                  = 0x22,
-        MediaAutoPlayEnabled             = 0x23,
-        LobbyParameter                   = 0x24,
-        ApplicationAlbumEntry            = 0x26,
-        JsExtensionEnabled               = 0x27,
-        AdditionalCommentText            = 0x28,
-        TouchEnabledOnContents           = 0x29,
-        UserAgentAdditionalString        = 0x2A,
-        AdditionalMediaData0             = 0x2B,
-        MediaPlayerAutoCloseEnabled      = 0x2C,
-        PageCacheEnabled                 = 0x2D,
-        WebAudioEnabled                  = 0x2E,
-        FooterFixedKind                  = 0x32,
-        PageFadeEnabled                  = 0x33,
+        InitialURL = 0x1,
+        CallbackUrl = 0x3,
+        CallbackableUrl = 0x4,
+        ApplicationId = 0x5,
+        DocumentPath = 0x6,
+        DocumentKind = 0x7,
+        SystemDataId = 0x8,
+        ShareStartPage = 0x9,
+        Whitelist = 0xA,
+        NewsFlag = 0xB,
+        UserID = 0xE,
+        AlbumEntry0 = 0xF,
+        ScreenShotEnabled = 0x10,
+        EcClientCertEnabled = 0x11,
+        PlayReportEnabled = 0x13,
+        UnknownFlag0x14 = 0x14,
+        UnknownFlag0x15 = 0x15,
+        BootDisplayKind = 0x17,
+        BackgroundKind = 0x18,
+        FooterEnabled = 0x19,
+        PointerEnabled = 0x1A,
+        LeftStickMode = 0x1B,
+        KeyRepeatFrame1 = 0x1C,
+        KeyRepeatFrame2 = 0x1D,
+        BootAsMediaPlayerInverted = 0x1E,
+        DisplayUrlKind = 0x1F,
+        BootAsMediaPlayer = 0x21,
+        ShopJumpEnabled = 0x22,
+        MediaAutoPlayEnabled = 0x23,
+        LobbyParameter = 0x24,
+        ApplicationAlbumEntry = 0x26,
+        JsExtensionEnabled = 0x27,
+        AdditionalCommentText = 0x28,
+        TouchEnabledOnContents = 0x29,
+        UserAgentAdditionalString = 0x2A,
+        AdditionalMediaData0 = 0x2B,
+        MediaPlayerAutoCloseEnabled = 0x2C,
+        PageCacheEnabled = 0x2D,
+        WebAudioEnabled = 0x2E,
+        FooterFixedKind = 0x32,
+        PageFadeEnabled = 0x33,
         MediaCreatorApplicationRatingAge = 0x34,
-        BootLoadingIconEnabled           = 0x35,
-        PageScrollIndicatorEnabled       = 0x36,
-        MediaPlayerSpeedControlEnabled   = 0x37,
-        AlbumEntry1                      = 0x38,
-        AlbumEntry2                      = 0x39,
-        AlbumEntry3                      = 0x3A,
-        AdditionalMediaData1             = 0x3B,
-        AdditionalMediaData2             = 0x3C,
-        AdditionalMediaData3             = 0x3D,
-        BootFooterButton                 = 0x3E,
-        OverrideWebAudioVolume           = 0x3F,
-        OverrideMediaAudioVolume         = 0x40,
-        BootMode                         = 0x41,
-        MediaPlayerUiEnabled             = 0x43
+        BootLoadingIconEnabled = 0x35,
+        PageScrollIndicatorEnabled = 0x36,
+        MediaPlayerSpeedControlEnabled = 0x37,
+        AlbumEntry1 = 0x38,
+        AlbumEntry2 = 0x39,
+        AlbumEntry3 = 0x3A,
+        AdditionalMediaData1 = 0x3B,
+        AdditionalMediaData2 = 0x3C,
+        AdditionalMediaData3 = 0x3D,
+        BootFooterButton = 0x3E,
+        OverrideWebAudioVolume = 0x3F,
+        OverrideMediaAudioVolume = 0x40,
+        BootMode = 0x41,
+        MediaPlayerUiEnabled = 0x43,
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs

@@ -5,8 +5,8 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
     public struct WebCommonReturnValue
     {
         public WebExitReason ExitReason;
-        public uint          Padding;
+        public uint Padding;
         public ByteArray4096 LastUrl;
-        public ulong         LastUrlSize;
+        public ulong LastUrlSize;
     }
 }

src/Ryujinx.HLE/HOS/Applets/Browser/WebExitReason.cs

@@ -6,6 +6,6 @@
         BackButton,
         Requested,
         LastUrl,
-        ErrorDialog = 7
+        ErrorDialog = 7,
     }
 }

src/Ryujinx.HLE/HOS/Applets/CommonArguments.cs

@@ -5,12 +5,12 @@ namespace Ryujinx.HLE.HOS.Applets
     [StructLayout(LayoutKind.Sequential, Pack = 8)]
     struct CommonArguments
     {
-        public uint  Version;
-        public uint  StructureSize;
-        public uint  AppletVersion;
-        public uint  ThemeColor;
+        public uint Version;
+        public uint StructureSize;
+        public uint AppletVersion;
+        public uint ThemeColor;
         [MarshalAs(UnmanagedType.I1)]
-        public bool  PlayStartupSound;
+        public bool PlayStartupSound;
         public ulong SystemTicks;
     }
 }

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Applets
 {
     internal class ControllerApplet : IApplet
     {
-        private Horizon _system;
+        private readonly Horizon _system;
 
         private AppletSession _normalSession;
 
@@ -65,7 +65,7 @@ namespace Ryujinx.HLE.HOS.Applets
             }
             else
             {
-                Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerSupportArg Version Unknown");
+                Logger.Stub?.PrintStub(LogClass.ServiceHid, "ControllerSupportArg Version Unknown");
 
                 argHeader = IApplet.ReadStruct<ControllerSupportArgHeader>(controllerSupportArg); // Read just the header
             }
@@ -82,17 +82,17 @@ namespace Ryujinx.HLE.HOS.Applets
                 playerMin = playerMax = 1;
             }
 
-            int configuredCount = 0;
-            PlayerIndex primaryIndex = PlayerIndex.Unknown;
+            int configuredCount;
+            PlayerIndex primaryIndex;
             while (!_system.Device.Hid.Npads.Validate(playerMin, playerMax, (ControllerType)privateArg.NpadStyleSet, out configuredCount, out primaryIndex))
             {
-                ControllerAppletUiArgs uiArgs = new ControllerAppletUiArgs
+                ControllerAppletUiArgs uiArgs = new()
                 {
                     PlayerCountMin = playerMin,
                     PlayerCountMax = playerMax,
                     SupportedStyles = (ControllerType)privateArg.NpadStyleSet,
                     SupportedPlayers = _system.Device.Hid.Npads.GetSupportedPlayers(),
-                    IsDocked = _system.State.DockedMode
+                    IsDocked = _system.State.DockedMode,
                 };
 
                 if (!_system.Device.UiHandler.DisplayMessageDialog(uiArgs))
@@ -101,10 +101,10 @@ namespace Ryujinx.HLE.HOS.Applets
                 }
             }
 
-            ControllerSupportResultInfo result = new ControllerSupportResultInfo
+            ControllerSupportResultInfo result = new()
             {
                 PlayerCount = (sbyte)configuredCount,
-                SelectedId = (uint)GetNpadIdTypeFromIndex(primaryIndex)
+                SelectedId = (uint)GetNpadIdTypeFromIndex(primaryIndex),
             };
 
             Logger.Stub?.PrintStub(LogClass.ServiceHid, $"ControllerApplet ReturnResult {result.PlayerCount} {result.SelectedId}");
@@ -122,26 +122,24 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        private byte[] BuildResponse(ControllerSupportResultInfo result)
+        private static byte[] BuildResponse(ControllerSupportResultInfo result)
         {
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                writer.Write(MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref result, Unsafe.SizeOf<ControllerSupportResultInfo>())));
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            writer.Write(MemoryMarshal.AsBytes(MemoryMarshal.CreateReadOnlySpan(ref result, Unsafe.SizeOf<ControllerSupportResultInfo>())));
+
+            return stream.ToArray();
         }
 
-        private byte[] BuildResponse()
+        private static byte[] BuildResponse()
         {
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                writer.Write((ulong)ResultCode.Success);
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
 
-                return stream.ToArray();
-            }
+            writer.Write((ulong)ResultCode.Success);
+
+            return stream.ToArray();
         }
     }
 }

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerAppletUiArgs.cs

@@ -11,4 +11,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public IEnumerable<PlayerIndex> SupportedPlayers;
         public bool IsDocked;
     }
-}
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgHeader.cs

@@ -2,7 +2,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportArgHeader
     {
@@ -15,4 +15,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public byte EnableIdentificationColor;
     }
 #pragma warning restore CS0649
-}
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgPrivate.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     struct ControllerSupportArgPrivate
     {
         public uint PrivateSize;
@@ -13,4 +13,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public uint NpadJoyHoldType;
     }
 #pragma warning restore CS0649
-}
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgV7.cs

@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     // (8.0.0+ version)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportArgV7
@@ -23,4 +23,4 @@ namespace Ryujinx.HLE.HOS.Applets
         }
     }
 #pragma warning restore CS0649
-}
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportArgVPre7.cs

@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     // (1.0.0+ version)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportArgVPre7
@@ -23,4 +23,4 @@ namespace Ryujinx.HLE.HOS.Applets
         }
     }
 #pragma warning restore CS0649
-}
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportMode.cs

@@ -4,6 +4,6 @@ namespace Ryujinx.HLE.HOS.Applets
     {
         ShowControllerSupport = 0,
         ShowControllerStrapGuide = 1,
-        ShowControllerFirmwareUpdate = 2
+        ShowControllerFirmwareUpdate = 2,
     }
-}
+}

src/Ryujinx.HLE/HOS/Applets/Controller/ControllerSupportResultInfo.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Applets
 {
-#pragma warning disable CS0649
+#pragma warning disable CS0649 // Field is never assigned to
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ControllerSupportResultInfo
     {
@@ -13,4 +13,4 @@ namespace Ryujinx.HLE.HOS.Applets
         public uint Result;
     }
 #pragma warning restore CS0649
-}
+}

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

@@ -6,9 +6,9 @@ namespace Ryujinx.HLE.HOS.Applets.Error
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct ApplicationErrorArg
     {
-        public uint          ErrorNumber;
-        public ulong         LanguageCode;
+        public uint ErrorNumber;
+        public ulong LanguageCode;
         public ByteArray2048 MessageText;
         public ByteArray2048 DetailsText;
     }
-} 
+}

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

@@ -22,11 +22,11 @@ namespace Ryujinx.HLE.HOS.Applets.Error
     {
         private const long ErrorMessageBinaryTitleId = 0x0100000000000801;
 
-        private Horizon           _horizon;
-        private AppletSession     _normalSession;
-        private CommonArguments   _commonArguments;
+        private readonly Horizon _horizon;
+        private AppletSession _normalSession;
+        private CommonArguments _commonArguments;
         private ErrorCommonHeader _errorCommonHeader;
-        private byte[]            _errorStorage;
+        private byte[] _errorStorage;
 
         public event EventHandler AppletStateChanged;
 
@@ -40,14 +40,14 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
         public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
         {
-            _normalSession   = normalSession;
+            _normalSession = normalSession;
             _commonArguments = IApplet.ReadStruct<CommonArguments>(_normalSession.Pop());
 
             Logger.Info?.PrintMsg(LogClass.ServiceAm, $"ErrorApplet version: 0x{_commonArguments.AppletVersion:x8}");
 
-            _errorStorage      = _normalSession.Pop();
+            _errorStorage = _normalSession.Pop();
             _errorCommonHeader = IApplet.ReadStruct<ErrorCommonHeader>(_errorStorage);
-            _errorStorage      = _errorStorage.Skip(Marshal.SizeOf<ErrorCommonHeader>()).ToArray();
+            _errorStorage = _errorStorage.Skip(Marshal.SizeOf<ErrorCommonHeader>()).ToArray();
 
             switch (_errorCommonHeader.Type)
             {
@@ -63,7 +63,8 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
                         break;
                     }
-                default: throw new NotImplementedException($"ErrorApplet type {_errorCommonHeader.Type} is not implemented.");
+                default:
+                    throw new NotImplementedException($"ErrorApplet type {_errorCommonHeader.Type} is not implemented.");
             }
 
             AppletStateChanged?.Invoke(this, null);
@@ -71,15 +72,16 @@ namespace Ryujinx.HLE.HOS.Applets.Error
             return ResultCode.Success;
         }
 
-        private (uint module, uint description) HexToResultCode(uint resultCode)
+        private static (uint module, uint description) HexToResultCode(uint resultCode)
         {
             return ((resultCode & 0x1FF) + 2000, (resultCode >> 9) & 0x3FFF);
         }
 
-        private string SystemLanguageToLanguageKey(SystemLanguage systemLanguage)
+        private static string SystemLanguageToLanguageKey(SystemLanguage systemLanguage)
         {
             return systemLanguage switch
             {
+#pragma warning disable IDE0055 // Disable formatting
                 SystemLanguage.Japanese             => "ja",
                 SystemLanguage.AmericanEnglish      => "en-US",
                 SystemLanguage.French               => "fr",
@@ -98,7 +100,8 @@ namespace Ryujinx.HLE.HOS.Applets.Error
                 SystemLanguage.SimplifiedChinese    => "zh-Hans",
                 SystemLanguage.TraditionalChinese   => "zh-Hant",
                 SystemLanguage.BrazilianPortuguese  => "pt-BR",
-                _                                   => "en-US"
+                _                                   => "en-US",
+#pragma warning restore IDE0055
             };
         }
 
@@ -111,26 +114,24 @@ namespace Ryujinx.HLE.HOS.Applets.Error
         {
             string binaryTitleContentPath = _horizon.ContentManager.GetInstalledContentPath(ErrorMessageBinaryTitleId, StorageId.BuiltInSystem, NcaContentType.Data);
 
-            using (LibHac.Fs.IStorage ncaFileStream = new LocalStorage(_horizon.Device.FileSystem.SwitchPathToSystemPath(binaryTitleContentPath), FileAccess.Read, FileMode.Open))
+            using LibHac.Fs.IStorage ncaFileStream = new LocalStorage(FileSystem.VirtualFileSystem.SwitchPathToSystemPath(binaryTitleContentPath), FileAccess.Read, FileMode.Open);
+            Nca nca = new(_horizon.Device.FileSystem.KeySet, ncaFileStream);
+            IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, _horizon.FsIntegrityCheckLevel);
+            string languageCode = SystemLanguageToLanguageKey(_horizon.State.DesiredSystemLanguage);
+            string filePath = $"/{module}/{description:0000}/{languageCode}_{key}";
+
+            if (romfs.FileExists(filePath))
             {
-                Nca         nca          = new Nca(_horizon.Device.FileSystem.KeySet, ncaFileStream);
-                IFileSystem romfs        = nca.OpenFileSystem(NcaSectionType.Data, _horizon.FsIntegrityCheckLevel);
-                string      languageCode = SystemLanguageToLanguageKey(_horizon.State.DesiredSystemLanguage);
-                string      filePath     = $"/{module}/{description:0000}/{languageCode}_{key}";
+                using var binaryFile = new UniqueRef<IFile>();
 
-                if (romfs.FileExists(filePath))
-                {
-                    using var binaryFile = new UniqueRef<IFile>();
+                romfs.OpenFile(ref binaryFile.Ref, filePath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
+                StreamReader reader = new(binaryFile.Get.AsStream(), Encoding.Unicode);
 
-                    romfs.OpenFile(ref binaryFile.Ref, filePath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
-                    StreamReader reader = new StreamReader(binaryFile.Get.AsStream(), Encoding.Unicode);
-
-                    return CleanText(reader.ReadToEnd());
-                }
-                else
-                {
-                    return "";
-                }
+                return CleanText(reader.ReadToEnd());
+            }
+            else
+            {
+                return "";
             }
         }
 
@@ -145,7 +146,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
         {
             ErrorCommonArg errorCommonArg = IApplet.ReadStruct<ErrorCommonArg>(_errorStorage);
 
-            uint module      = errorCommonArg.Module;
+            uint module = errorCommonArg.Module;
             uint description = errorCommonArg.Description;
 
             if (_errorCommonHeader.MessageFlag == 0)
@@ -188,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
             string messageText = Encoding.ASCII.GetString(messageTextBuffer.TakeWhile(b => !b.Equals(0)).ToArray());
             string detailsText = Encoding.ASCII.GetString(detailsTextBuffer.TakeWhile(b => !b.Equals(0)).ToArray());
 
-            List<string> buttons = new List<string>();
+            List<string> buttons = new();
 
             // TODO: Handle the LanguageCode to return the translated "OK" and "Details".
 
@@ -213,4 +214,4 @@ namespace Ryujinx.HLE.HOS.Applets.Error
             return ResultCode.Success;
         }
     }
-}
+}

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

@@ -9,4 +9,4 @@ namespace Ryujinx.HLE.HOS.Applets.Error
         public uint Description;
         public uint ResultCode;
     }
-}
+}

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

@@ -6,12 +6,12 @@ namespace Ryujinx.HLE.HOS.Applets.Error
     struct ErrorCommonHeader
     {
         public ErrorType Type;
-        public byte      JumpFlag;
-        public byte      ReservedFlag1;
-        public byte      ReservedFlag2;
-        public byte      ReservedFlag3;
-        public byte      ContextFlag;
-        public byte      MessageFlag;
-        public byte      ContextFlag2;
+        public byte JumpFlag;
+        public byte ReservedFlag1;
+        public byte ReservedFlag2;
+        public byte ReservedFlag3;
+        public byte ContextFlag;
+        public byte MessageFlag;
+        public byte ContextFlag2;
     }
-}
+}

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

@@ -8,6 +8,6 @@
         ErrorEulaArg,
         ErrorPctlArg,
         ErrorRecordArg,
-        SystemUpdateEulaArg = 8
+        SystemUpdateEulaArg = 8,
     }
-}
+}

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

@@ -8,10 +8,12 @@ namespace Ryujinx.HLE.HOS.Applets
 {
     internal class PlayerSelectApplet : IApplet
     {
-        private Horizon _system;
+        private readonly Horizon _system;
 
         private AppletSession _normalSession;
+#pragma warning disable IDE0052 // Remove unread private member
         private AppletSession _interactiveSession;
+#pragma warning restore IDE0052
 
         public event EventHandler AppletStateChanged;
 
@@ -22,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Applets
 
         public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession)
         {
-            _normalSession      = normalSession;
+            _normalSession = normalSession;
             _interactiveSession = interactiveSession;
 
             // TODO(jduncanator): Parse PlayerSelectConfig from input data
@@ -44,15 +46,14 @@ namespace Ryujinx.HLE.HOS.Applets
         {
             UserProfile currentUser = _system.AccountManager.LastOpenedUser;
 
-            using (MemoryStream stream = MemoryStreamManager.Shared.GetStream())
-            using (BinaryWriter writer = new BinaryWriter(stream))
-            {
-                writer.Write((ulong)PlayerSelectResult.Success);
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
 
-                currentUser.UserId.Write(writer);
+            writer.Write((ulong)PlayerSelectResult.Success);
 
-                return stream.ToArray();
-            }
+            currentUser.UserId.Write(writer);
+
+            return stream.ToArray();
         }
     }
 }

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

@@ -3,6 +3,6 @@
     enum PlayerSelectResult : ulong
     {
         Success = 0,
-        Failure = 2
+        Failure = 2,
     }
 }