Add workflow to automatically check code style issues for PRs (#4670)

* Add workflow to perform automated checks for PRs

* Downgrade Microsoft.CodeAnalysis to 4.4.0

This is a workaround to fix issues with dotnet-format.
See:
- https://github.com/dotnet/format/issues/1805
- https://github.com/dotnet/format/issues/1800

* Adjust editorconfig to be more compatible with Ryujinx code-style

* Adjust .editorconfig line endings to match .gitattributes

* Disable 'prefer switch expression' rule

* Remove naming styles

These are the default rules, so we don't need to override them.

* Silence IDE0060 in .editorconfig

* Slightly adjust .editorconfig

* Add lost workflow changes

* Move .editorconfig comment to the top

* .editorconfig: private static readonly fields should be _lowerCamelCase

* .editorconfig: Remove alignment for declarations as well

* editorconfig: Add rule for local constants

* Disable CA1822 for HLE services

* Disable CA1822 for ViewModels

Bindings won't work with static members, but this issue is silently ignored.

* Run dotnet format for the whole solution

* Check result code of SDL_GetDisplayBounds

* Fix dotnet format style issues

* Add missing trailing commas

* Update Microsoft.CodeAnalysis.CSharp to 4.6.0

Skipping 4.5.0 since it breaks dotnet format

* Restore old default naming rules for dotnet format

* Add naming rule exception for CPU tests

* checks: Include all files before excluding paths

* Fix dotnet format issues

* Check dotnet format version

* checks: Run dotnet format with severity info again

* checks: Disable naming style rules until they won't crash the process anymore

* Remove unread private member

* checks: Attempt to run analyzers 3 times before giving up

* checks: Enable naming style rules again with the new retry logic

.editorconfig

@@ -1,8 +1,7 @@
 # Remove the line below if you want to inherit .editorconfig settings from higher directories
 root = true
 
-# C# files
-[*.cs]
+[*]
 
 #### Core EditorConfig Options ####
 
@@ -12,8 +11,11 @@ indent_style = space
 tab_width = 4
 
 # New line preferences
-end_of_line = crlf
-insert_final_newline = false
+end_of_line = lf
+insert_final_newline = true
+
+# C# files
+[*.cs]
 
 #### .NET Coding Conventions ####
 
@@ -59,7 +61,7 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
 dotnet_style_readonly_field = true:suggestion
 
 # Parameter preferences
-dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_code_quality_unused_parameters = all:silent
 
 #### C# Coding Conventions ####
 
@@ -85,7 +87,7 @@ csharp_style_expression_bodied_properties = true:silent
 # Pattern matching preferences
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_prefer_switch_expression = true:suggestion
+csharp_style_prefer_switch_expression = false:silent
 
 # Null-checking preferences
 csharp_style_conditional_delegate_call = true:suggestion
@@ -94,6 +96,7 @@ csharp_style_conditional_delegate_call = true:suggestion
 csharp_prefer_static_local_function = true:suggestion
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent
 csharp_style_prefer_readonly_struct = true
+csharp_style_prefer_method_group_conversion = true
 
 # Code-block preferences
 csharp_prefer_braces = true:silent
@@ -109,6 +112,7 @@ csharp_style_prefer_range_operator = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_implicit_object_creation_when_type_is_apparent = true
 
 # 'using' directive preferences
 csharp_using_directive_placement = outside_namespace:silent
@@ -140,7 +144,6 @@ csharp_space_after_dot = false
 csharp_space_after_keywords_in_control_flow_statements = true
 csharp_space_after_semicolon_in_for_statement = true
 csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
 csharp_space_before_colon_in_inheritance_clause = true
 csharp_space_before_comma = false
 csharp_space_before_dot = false
@@ -158,23 +161,31 @@ csharp_space_between_square_brackets = false
 
 # Wrapping preferences
 csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_statements = false
 
 #### Naming styles ####
 
 # Naming rules
 
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+dotnet_naming_rule.interfaces_should_be_prefixed_with_I.severity = suggestion
+dotnet_naming_rule.interfaces_should_be_prefixed_with_I.symbols = interface
+dotnet_naming_rule.interfaces_should_be_prefixed_with_I.style = IPascalCase
 
 dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+dotnet_naming_rule.types_should_be_pascal_case.style = PascalCase
 
 dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = PascalCase
+
+dotnet_naming_rule.private_static_readonly_fields_should_be_camel_case_and_prefixed_with__.symbols = private_static_readonly_fields
+dotnet_naming_rule.private_static_readonly_fields_should_be_camel_case_and_prefixed_with__.severity = suggestion
+dotnet_naming_rule.private_static_readonly_fields_should_be_camel_case_and_prefixed_with__.style = _camelCase
+
+dotnet_naming_rule.local_constants_should_be_pascal_case.symbols = local_constants
+dotnet_naming_rule.local_constants_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.local_constants_should_be_pascal_case.style = PascalCase
 
 # Symbol specifications
 
@@ -190,14 +201,39 @@ dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, meth
 dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
 dotnet_naming_symbols.non_field_members.required_modifiers =
 
+dotnet_naming_symbols.private_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.private_static_readonly_fields.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly_fields.required_modifiers = static, readonly
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.applicable_accessibilities = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+
 # Naming styles
 
-dotnet_naming_style.pascal_case.required_prefix =
-dotnet_naming_style.pascal_case.required_suffix =
-dotnet_naming_style.pascal_case.word_separator =
-dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_naming_style._camelCase.required_prefix = _
+dotnet_naming_style._camelCase.required_suffix =
+dotnet_naming_style._camelCase.word_separator =
+dotnet_naming_style._camelCase.capitalization = camel_case
 
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix =
-dotnet_naming_style.begins_with_i.word_separator =
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
+dotnet_naming_style.PascalCase.required_prefix =
+dotnet_naming_style.PascalCase.required_suffix =
+dotnet_naming_style.PascalCase.word_separator =
+dotnet_naming_style.PascalCase.capitalization = pascal_case
+
+dotnet_naming_style.IPascalCase.required_prefix = I
+dotnet_naming_style.IPascalCase.required_suffix =
+dotnet_naming_style.IPascalCase.word_separator =
+dotnet_naming_style.IPascalCase.capitalization = pascal_case
+
+[src/Ryujinx.HLE/HOS/Services/**.cs]
+# Disable "mark members as static" rule for services
+dotnet_diagnostic.CA1822.severity = none
+
+[src/Ryujinx.Ava/UI/ViewModels/**.cs]
+# Disable "mark members as static" rule for ViewModels
+dotnet_diagnostic.CA1822.severity = none
+
+[src/Ryujinx.Tests/Cpu/*.cs]
+# Disable naming rules for CPU tests
+dotnet_diagnostic.IDE1006.severity = none

.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/build.yml

@@ -1,19 +1,10 @@
 name: Build job
 
 on:
-  workflow_dispatch:
-    inputs: {}
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/**'
-      - '*.yml'
-      - '*.json'
-      - '*.config'
-      - 'README.md'
+  workflow_call:
 
 concurrency:
-  group: pr-checks-${{ github.event.number }}
+  group: pr-builds-${{ github.event.number }}
   cancel-in-progress: true
 
 env:

.github/workflows/checks.yml

@@ -0,0 +1,71 @@
+name: Perform checks
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths:
+      - '**'
+      - '!.github/**'
+      - '!*.yml'
+      - '!*.config'
+      - '!README.md'
+      - '.github/workflows/*.yml'
+
+permissions:
+  pull-requests: write
+  checks: write
+
+concurrency:
+  group: pr-checks-${{ github.event.number }}
+  cancel-in-progress: true
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
+
+      - run: dotnet restore
+
+      - name: Print dotnet format version
+        run: dotnet format --version
+
+      - name: Run dotnet format whitespace
+        run: |
+          dotnet format whitespace --verify-no-changes --report ./whitespace-report.json -v d
+
+      - name: Run dotnet format style
+        run: |
+          dotnet format style --severity info --verify-no-changes --report ./style-report.json -v d
+
+      # For some reason this step sometimes fails with exit code 139 (segfault?),
+      # so should that be the case we'll try again (3 tries max).
+      - name: Run dotnet format analyzers
+        run: |
+          attempt=0
+          exit_code=139
+          until [ $attempt -ge 3 ] || [ $exit_code -ne 139 ]; do
+            ((attempt+=1))
+            exit_code=0
+            echo "Attempt: ${attempt}/3"
+            dotnet format analyzers --severity info --verify-no-changes --report ./analyzers-report.json -v d || exit_code=$?
+          done
+          exit $exit_code
+
+      - name: Upload report
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: dotnet-format
+          path: ./*-report.json
+
+  pr_build:
+    uses: ./.github/workflows/build.yml
+    needs: format
+    secrets: inherit

.github/workflows/nightly_pr_comment.yml

@@ -1,8 +1,10 @@
 name: Comment PR artifacts links
+
 on:
   workflow_run:
-    workflows: ['Build job']
+    workflows: ['Perform checks']
     types: [completed]
+
 jobs:
   pr_comment:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'

.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

@@ -20,7 +20,7 @@
     <PackageVersion Include="jp2masa.Avalonia.Flexbox" Version="0.2.0" />
     <PackageVersion Include="LibHac" Version="0.18.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -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/Decoders/OpCode32SimdCvtFFixed.cs

@@ -20,4 +20,4 @@
             }
         }
     }
-}
+}

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.Audio.Backends.OpenAL/OpenALHardwareDeviceDriver.cs

@@ -31,7 +31,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
             _stillRunning = true;
             _updaterThread = new Thread(Update)
             {
-                Name = "HardwareDeviceDriver.OpenAL"
+                Name = "HardwareDeviceDriver.OpenAL",
             };
 
             _updaterThread.Start();

src/Ryujinx.Audio.Backends.OpenAL/OpenALHardwareDeviceSession.cs

@@ -67,7 +67,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
                 {
                     DriverIdentifier = buffer.DataPointer,
                     BufferId = AL.GenBuffer(),
-                    SampleCount = GetSampleCount(buffer)
+                    SampleCount = GetSampleCount(buffer),
                 };
 
                 AL.BufferData(driverBuffer.BufferId, _targetFormat, buffer.Data, (int)RequestedSampleRate);

src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceDriver.cs

@@ -7,7 +7,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Runtime.InteropServices;
 using System.Threading;
-
 using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 using static SDL2.SDL;
 
@@ -111,7 +110,7 @@ namespace Ryujinx.Audio.Backends.SDL2
                 channels = (byte)requestedChannelCount,
                 format = GetSDL2Format(requestedSampleFormat),
                 freq = (int)requestedSampleRate,
-                samples = (ushort)sampleCount
+                samples = (ushort)sampleCount,
             };
         }
 

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoBackend.cs

@@ -8,6 +8,6 @@
         Alsa = 3,
         CoreAudio = 4,
         Wasapi = 5,
-        Dummy = 6
+        Dummy = 6,
     }
 }

src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoDeviceAim.cs

@@ -3,6 +3,6 @@
     public enum SoundIoDeviceAim
     {
         SoundIoDeviceAimInput = 0,
-        SoundIoDeviceAimOutput = 1
+        SoundIoDeviceAimOutput = 1,
     }
 }

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/Applet/AvaHostUiHandler.cs

@@ -53,8 +53,6 @@ namespace Ryujinx.Ava.UI.Applet
 
                     bool opened = false;
 
-                    _parent.Activate();
-
                     UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent,
                        title,
                        message,

src/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs

@@ -315,8 +315,10 @@ namespace Ryujinx.Ava.UI.Helpers
 
             Window parent = GetMainWindow();
 
-            if (parent is { IsActive: true } and MainWindow window && window.ViewModel.IsGameRunning)
+            if (parent is MainWindow window)
             {
+                parent.Activate();
+
                 contentDialogOverlayWindow = new()
                 {
                     Height = parent.Bounds.Height,
@@ -369,7 +371,9 @@ namespace Ryujinx.Ava.UI.Helpers
                 }
                 else
                 {
-                    result = await contentDialog.ShowAsync();
+                    result = ContentDialogResult.None;
+
+                    Logger.Warning?.Print(LogClass.Ui, "Content dialog overlay failed to populate. Default value has been returned.");
                 }
 
                 return result;
@@ -390,7 +394,7 @@ namespace Ryujinx.Ava.UI.Helpers
             {
                 foreach (Window item in al.Windows)
                 {
-                    if (item.IsActive && item is MainWindow window)
+                    if (item is MainWindow window)
                     {
                         return window;
                     }

src/Ryujinx.Ava/UI/Helpers/Glyph.cs

@@ -4,6 +4,6 @@
     {
         List,
         Grid,
-        Chip
+        Chip,
     }
 }

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/AsyncWorkQueue.cs

@@ -25,7 +25,7 @@ namespace Ryujinx.Common
             _workerThread = new Thread(DoWork)
             {
                 Name = name,
-                IsBackground = true
+                IsBackground = true,
             };
             _workerThread.Start();
         }

src/Ryujinx.Common/Configuration/BackendThreading.cs

@@ -8,6 +8,6 @@ namespace Ryujinx.Common.Configuration
     {
         Auto,
         Off,
-        On
+        On,
     }
 }

src/Ryujinx.Common/Configuration/GraphicsBackend.cs

@@ -7,6 +7,6 @@ namespace Ryujinx.Common.Configuration
     public enum GraphicsBackend
     {
         Vulkan,
-        OpenGl
+        OpenGl,
     }
 }

src/Ryujinx.Common/Configuration/GraphicsDebugLevel.cs

@@ -9,6 +9,6 @@ namespace Ryujinx.Common.Configuration
         None,
         Error,
         Slowdowns,
-        All
+        All,
     }
 }

src/Ryujinx.Common/Configuration/Hid/Controller/Motion/MotionInputBackendType.cs

@@ -8,6 +8,6 @@ namespace Ryujinx.Common.Configuration.Hid.Controller.Motion
     {
         Invalid,
         GamepadDriver,
-        CemuHook
+        CemuHook,
     }
 }

src/Ryujinx.Common/Configuration/MemoryManagerMode.cs

@@ -8,6 +8,6 @@ namespace Ryujinx.Common.Configuration
     {
         SoftwarePageTable,
         HostMapped,
-        HostMappedUnsafe
+        HostMappedUnsafe,
     }
 }

src/Ryujinx.Common/GraphicsDriver/NVAPI/Nvapi.cs

@@ -6,6 +6,6 @@
 
         OglThreadControlDefault = 0,
         OglThreadControlEnable = 1,
-        OglThreadControlDisable = 2
+        OglThreadControlDisable = 2,
     }
 }

src/Ryujinx.Common/Logging/LogLevel.cs

@@ -14,6 +14,6 @@ namespace Ryujinx.Common.Logging
         Guest,
         AccessLog,
         Notice,
-        Trace
+        Trace,
     }
 }

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.Cpu/AddressSpace.cs

@@ -179,7 +179,7 @@ namespace Ryujinx.Cpu
         {
             addressSpace = null;
 
-            const MemoryAllocationFlags asFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible;
+            const MemoryAllocationFlags AsFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible;
 
             ulong minAddressSpaceSize = Math.Min(asSize, 1UL << 36);
 
@@ -191,8 +191,8 @@ namespace Ryujinx.Cpu
 
                 try
                 {
-                    baseMemory = new MemoryBlock(addressSpaceSize, asFlags);
-                    mirrorMemory = new MemoryBlock(addressSpaceSize, asFlags);
+                    baseMemory = new MemoryBlock(addressSpaceSize, AsFlags);
+                    mirrorMemory = new MemoryBlock(addressSpaceSize, AsFlags);
                     addressSpace = new AddressSpace(backingMemory, baseMemory, mirrorMemory, addressSpaceSize, supports4KBPages);
 
                     break;

src/Ryujinx.Cpu/AppleHv/Arm/ApFlags.cs

@@ -22,6 +22,6 @@ namespace Ryujinx.Cpu.AppleHv.Arm
 
         UserNoneKernelReadWrite = (1UL << (int)PxnShift) | (1UL << (int)UxnShift) | (0UL << (int)ApShift),
         UserNoneKernelRead = (1UL << (int)PxnShift) | (1UL << (int)UxnShift) | (2UL << (int)ApShift),
-        UserReadKernelRead = (1UL << (int)PxnShift) | (1UL << (int)UxnShift) | (3UL << (int)ApShift)
+        UserReadKernelRead = (1UL << (int)PxnShift) | (1UL << (int)UxnShift) | (3UL << (int)ApShift),
     }
 }

src/Ryujinx.Graphics.Device/SizeCalculator.cs

@@ -56,7 +56,7 @@ namespace Ryujinx.Graphics.Device
                 TypeCode.Double => sizeof(double),
                 TypeCode.Decimal => sizeof(decimal),
                 TypeCode.Boolean => sizeof(bool),
-                _ => throw new ArgumentException($"Length for type \"{type.Name}\" is unknown.")
+                _ => throw new ArgumentException($"Length for type \"{type.Name}\" is unknown."),
             };
         }
     }

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

@@ -412,7 +412,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public ICounterEvent ReportCounter(CounterType type, EventHandler<ulong> resultHandler, float divisor, bool hostReserved)
         {
-            ThreadedCounterEvent evt = new ThreadedCounterEvent(this, type, _lastSampleCounterClear);
+            ThreadedCounterEvent evt = new(this, type, _lastSampleCounterClear);
             New<ReportCounterCommand>().Set(Ref(evt), type, Ref(resultHandler), divisor, hostReserved);
             QueueCommand();
 

src/Ryujinx.Graphics.Gpu/Memory/SupportBufferUpdater.cs

@@ -187,7 +187,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     X = scale * 2f / viewportWidth,
                     Y = scale * 2f / viewportHeight,
                     Z = 1,
-                    W = disableTransformF
+                    W = disableTransformF,
                 });
             }
         }
@@ -210,7 +210,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 ReadOnlySpan<byte> data = MemoryMarshal.Cast<SupportBuffer, byte>(MemoryMarshal.CreateSpan(ref _data, 1));
 
-                _renderer.SetBufferData(_handle, _startOffset, data.Slice(_startOffset, _endOffset - _startOffset));
+                _renderer.SetBufferData(_handle, _startOffset, data[_startOffset.._endOffset]);
 
                 _startOffset = -1;
                 _endOffset = -1;

src/Ryujinx.Graphics.Gpu/Window.cs

@@ -8,8 +8,6 @@ using System.Threading;
 
 namespace Ryujinx.Graphics.Gpu
 {
-    using Texture = Image.Texture;
-
     /// <summary>
     /// GPU image presentation window.
     /// </summary>
@@ -202,13 +200,13 @@ namespace Ryujinx.Graphics.Gpu
             {
                 pt.AcquireCallback(_context, pt.UserObj);
 
-                Texture texture = pt.Cache.FindOrCreateTexture(null, TextureSearchFlags.WithUpscale, pt.Info, 0, pt.Range);
+                Image.Texture texture = pt.Cache.FindOrCreateTexture(null, TextureSearchFlags.WithUpscale, pt.Info, 0, pt.Range);
 
                 pt.Cache.Tick();
 
                 texture.SynchronizeMemory();
 
-                ImageCrop crop = new ImageCrop(
+                ImageCrop crop = new(
                     (int)(pt.Crop.Left * texture.ScaleFactor),
                     (int)MathF.Ceiling(pt.Crop.Right * texture.ScaleFactor),
                     (int)(pt.Crop.Top * texture.ScaleFactor),

src/Ryujinx.Graphics.Host1x/ClassId.cs

@@ -15,6 +15,6 @@
         Tsec = 0xe0,
         Tsecb = 0xe1,
         Nvjpg = 0xc0,
-        Nvdec = 0xf0
+        Nvdec = 0xf0,
     }
 }

src/Ryujinx.Graphics.Host1x/Host1xClass.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Host1x
             _syncMgr = syncMgr;
             _state = new DeviceState<Host1xClassRegisters>(new Dictionary<string, RwCallback>
             {
-                { nameof(Host1xClassRegisters.WaitSyncpt32), new RwCallback(WaitSyncpt32, null) }
+                { nameof(Host1xClassRegisters.WaitSyncpt32), new RwCallback(WaitSyncpt32, null) },
             });
         }
 

src/Ryujinx.Graphics.Host1x/OpCode.cs

@@ -16,6 +16,6 @@
         NonIncrW,
         GatherW,
         RestartW,
-        Extend
+        Extend,
     }
 }

src/Ryujinx.Graphics.Host1x/ThiDevice.cs

@@ -57,7 +57,7 @@ namespace Ryujinx.Graphics.Host1x
             _state = new DeviceState<ThiRegisters>(new Dictionary<string, RwCallback>
             {
                 { nameof(ThiRegisters.IncrSyncpt), new RwCallback(IncrSyncpt, null) },
-                { nameof(ThiRegisters.Method1), new RwCallback(Method1, null) }
+                { nameof(ThiRegisters.Method1), new RwCallback(Method1, null) },
             });
 
             _previousContextId = -1;

src/Ryujinx.Graphics.Nvdec.FFmpeg/H264/SpsAndPpsReconstruction.cs

@@ -127,7 +127,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
             35, 42, 49, 56, 57, 50, 43, 36,
             29, 22, 15, 23, 30, 37, 44, 51,
             58, 59, 52, 45, 38, 31, 39, 46,
-            53, 60, 61, 54, 47, 55, 62, 63
+            53, 60, 61, 54, 47, 55, 62, 63,
         };
 
         private static ReadOnlySpan<byte> ZigZagScan => new byte[]
@@ -135,7 +135,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.H264
             0 + 0 * 4, 1 + 0 * 4, 0 + 1 * 4, 0 + 2 * 4,
             1 + 1 * 4, 2 + 0 * 4, 3 + 0 * 4, 2 + 1 * 4,
             1 + 2 * 4, 0 + 3 * 4, 1 + 3 * 4, 2 + 2 * 4,
-            3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4
+            3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4,
         };
 
         private static void WriteScalingList(ref H264BitStreamWriter writer, IArray<byte> list)

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/AVLog.cs

@@ -10,6 +10,6 @@
         Verbose = 40,
         Debug = 48,
         Trace = 56,
-        MaxOffset = 64
+        MaxOffset = 64,
     }
 }

src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
         private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
         {
             { AvCodecLibraryName, (58, 59) },
-            { AvUtilLibraryName, (56, 57) }
+            { AvUtilLibraryName, (56, 57) },
         };
 
         private static string FormatLibraryNameForCurrentOs(string libraryName, int version)

src/Ryujinx.Graphics.Nvdec/NvdecDevice.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Nvdec
             _rm = new ResourceManager(gmm, new SurfaceCache(gmm));
             _state = new DeviceState<NvdecRegisters>(new Dictionary<string, RwCallback>
             {
-                { nameof(NvdecRegisters.Execute), new RwCallback(Execute, null) }
+                { nameof(NvdecRegisters.Execute), new RwCallback(Execute, null) },
             });
             _contexts = new ConcurrentDictionary<long, NvdecDecoderContext>();
         }

src/Ryujinx.Graphics.Nvdec/Types/H264/PictureInfo.cs

@@ -116,7 +116,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.H264
                 FrameType = 0,
                 PicWidthInMbsMinus1 = PicWidthInMbs - 1,
                 PicHeightInMapUnitsMinus1 = (PicHeightInMbs >> (FrameMbsOnlyFlag != 0 ? 0 : 1)) - 1,
-                QpprimeYZeroTransformBypassFlag = QpprimeYZeroTransformBypassFlag
+                QpprimeYZeroTransformBypassFlag = QpprimeYZeroTransformBypassFlag,
             };
         }
     }

src/Ryujinx.Graphics.Nvdec/Types/Vp8/PictureInfo.cs

@@ -68,7 +68,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp8
                 FirstPartSize = FirstPartSize,
                 Version = Version,
                 FrameWidth = FrameWidth,
-                FrameHeight = FrameHeight
+                FrameHeight = FrameHeight,
             };
         }
     }

src/Ryujinx.Graphics.Nvdec/Types/Vp9/FrameFlags.cs

@@ -7,6 +7,6 @@
         FrameSizeChanged = 1 << 2,
         ErrorResilientMode = 1 << 3,
         LastShowFrame = 1 << 4,
-        IntraOnly = 1 << 5
+        IntraOnly = 1 << 5,
     }
 }

src/Ryujinx.Graphics.Nvdec/Types/Vp9/PictureInfo.cs

@@ -80,7 +80,7 @@ namespace Ryujinx.Graphics.Nvdec.Types.Vp9
                 SegmentFeatureData = Seg.FeatureData,
                 ModeRefDeltaEnabled = Lf.ModeRefDeltaEnabled != 0,
                 RefDeltas = Lf.RefDeltas,
-                ModeDeltas = Lf.ModeDeltas
+                ModeDeltas = Lf.ModeDeltas,
             };
         }
     }

src/Ryujinx.Graphics.OpenGL/EnumConversion.cs

@@ -668,7 +668,7 @@ namespace Ryujinx.Graphics.OpenGL
                 ShaderStage.TessellationEvaluation => ShaderType.TessEvaluationShader,
                 ShaderStage.Geometry => ShaderType.GeometryShader,
                 ShaderStage.Fragment => ShaderType.FragmentShader,
-                _ => ShaderType.VertexShader
+                _ => ShaderType.VertexShader,
             };
         }
     }

src/Ryujinx.Graphics.OpenGL/HwCapabilities.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.Graphics.OpenGL
             AmdUnix,
             IntelWindows,
             IntelUnix,
-            Nvidia
+            Nvidia,
         }
 
         private static readonly Lazy<GpuVendor> _gpuVendor = new(GetGpuVendor);

src/Ryujinx.Graphics.OpenGL/Image/Sampler.cs

@@ -33,7 +33,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                     info.BorderColor.Red,
                     info.BorderColor.Green,
                     info.BorderColor.Blue,
-                    info.BorderColor.Alpha
+                    info.BorderColor.Alpha,
                 };
 
                 GL.SamplerParameter(Handle, SamplerParameterName.TextureBorderColor, borderColor);

src/Ryujinx.Graphics.OpenGL/Image/TextureCopyIncompatible.cs

@@ -133,7 +133,7 @@ void main()
                     1 => SizedInternalFormat.R8ui,
                     2 => SizedInternalFormat.Rg8ui,
                     4 => SizedInternalFormat.Rgba8ui,
-                    _ => throw new ArgumentException($"Invalid components count {componentsCount}.")
+                    _ => throw new ArgumentException($"Invalid components count {componentsCount}."),
                 };
             }
             else if (componentSize == 2)
@@ -143,7 +143,7 @@ void main()
                     1 => SizedInternalFormat.R16ui,
                     2 => SizedInternalFormat.Rg16ui,
                     4 => SizedInternalFormat.Rgba16ui,
-                    _ => throw new ArgumentException($"Invalid components count {componentsCount}.")
+                    _ => throw new ArgumentException($"Invalid components count {componentsCount}."),
                 };
             }
             else if (componentSize == 4)
@@ -153,7 +153,7 @@ void main()
                     1 => SizedInternalFormat.R32ui,
                     2 => SizedInternalFormat.Rg32ui,
                     4 => SizedInternalFormat.Rgba32ui,
-                    _ => throw new ArgumentException($"Invalid components count {componentsCount}.")
+                    _ => throw new ArgumentException($"Invalid components count {componentsCount}."),
                 };
             }
             else

src/Ryujinx.Graphics.OpenGL/Image/TextureCopyMS.cs

@@ -173,7 +173,7 @@ void main()
                 4 => SizedInternalFormat.R32ui,
                 8 => SizedInternalFormat.Rg32ui,
                 16 => SizedInternalFormat.Rgba32ui,
-                _ => throw new ArgumentException($"Invalid bytes per pixel {bytesPerPixel}.")
+                _ => throw new ArgumentException($"Invalid bytes per pixel {bytesPerPixel}."),
             };
         }
 

src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs

@@ -72,7 +72,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                 (int)Info.SwizzleR.Convert(),
                 (int)Info.SwizzleG.Convert(),
                 (int)Info.SwizzleB.Convert(),
-                (int)Info.SwizzleA.Convert()
+                (int)Info.SwizzleA.Convert(),
             };
 
             if (Info.Format == Format.A1B5G5R5Unorm)
@@ -210,7 +210,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                 {
                     Target.Texture2DMultisample => Target.Texture2D,
                     Target.Texture2DMultisampleArray => Target.Texture2DArray,
-                    _ => Target
+                    _ => Target,
                 };
 
                 TextureView intermmediate = _renderer.TextureCopy.IntermediatePool.GetOrCreateWithAtLeast(
@@ -354,7 +354,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                     TextureTarget.TextureCubeMapArray => (layer / 6) * mipSize,
                     TextureTarget.Texture1DArray => layer * mipSize,
                     TextureTarget.Texture2DArray => layer * mipSize,
-                    _ => 0
+                    _ => 0,
                 };
             }
 

src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs

@@ -210,7 +210,7 @@ namespace Ryujinx.Graphics.OpenGL
                 GL.Arb.MaxShaderCompilerThreads(Math.Min(Environment.ProcessorCount, 8));
             }
 
-            _counters.Initialize(_pipeline);
+            _counters.Initialize();
 
             // This is required to disable [0, 1] clamping for SNorm outputs on compatibility profiles.
             // This call is expected to fail if we're running with a core profile,

src/Ryujinx.Graphics.OpenGL/Pipeline.cs

@@ -5,7 +5,6 @@ using Ryujinx.Graphics.OpenGL.Image;
 using Ryujinx.Graphics.OpenGL.Queries;
 using Ryujinx.Graphics.Shader;
 using System;
-using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Graphics.OpenGL
 {
@@ -44,7 +43,7 @@ namespace Ryujinx.Graphics.OpenGL
 
         private CounterQueueEvent _activeConditionalRender;
 
-        private Vector4<int>[] _fpIsBgra = new Vector4<int>[SupportBuffer.FragmentIsBgraCount];
+        private readonly Vector4<int>[] _fpIsBgra = new Vector4<int>[SupportBuffer.FragmentIsBgraCount];
 
         private readonly (TextureBase, Format)[] _images;
         private TextureBase _unit0Texture;

src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs

@@ -13,8 +13,6 @@ namespace Ryujinx.Graphics.OpenGL.Queries
         public CounterType Type { get; }
         public bool Disposed { get; private set; }
 
-        private readonly Pipeline _pipeline;
-
         private readonly Queue<CounterQueueEvent> _events = new();
         private CounterQueueEvent _current;
 
@@ -30,12 +28,10 @@ namespace Ryujinx.Graphics.OpenGL.Queries
 
         private readonly Thread _consumerThread;
 
-        internal CounterQueue(Pipeline pipeline, CounterType type)
+        internal CounterQueue(CounterType type)
         {
             Type = type;
 
-            _pipeline = pipeline;
-
             QueryTarget glType = GetTarget(Type);
 
             _queryPool = new Queue<BufferedQuery>(QueryPoolInitialSize);

src/Ryujinx.Graphics.OpenGL/Queries/Counters.cs

@@ -14,12 +14,12 @@ namespace Ryujinx.Graphics.OpenGL.Queries
             _counterQueues = new CounterQueue[count];
         }
 
-        public void Initialize(Pipeline pipeline)
+        public void Initialize()
         {
             for (int index = 0; index < _counterQueues.Length; index++)
             {
                 CounterType type = (CounterType)index;
-                _counterQueues[index] = new CounterQueue(pipeline, type);
+                _counterQueues[index] = new CounterQueue(type);
             }
         }
 

src/Ryujinx.Graphics.OpenGL/ResourcePool.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Graphics.OpenGL
                 {
                     Info = view.Info,
                     View = view,
-                    RemainingFrames = DisposedLiveFrames
+                    RemainingFrames = DisposedLiveFrames,
                 });
             }
         }

src/Ryujinx.Graphics.OpenGL/Sync.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Graphics.OpenGL
             SyncHandle handle = new()
             {
                 ID = id,
-                Handle = GL.FenceSync(SyncCondition.SyncGpuCommandsComplete, WaitSyncFlags.None)
+                Handle = GL.FenceSync(SyncCondition.SyncGpuCommandsComplete, WaitSyncFlags.None),
             };
 
 

src/Ryujinx.Graphics.Shader/BufferDescriptor.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.Graphics.Shader
 {
-    public struct BufferDescriptor
+    public readonly struct BufferDescriptor
     {
         // New fields should be added to the end of the struct to keep disk shader cache compatibility.
 

src/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs

@@ -11,7 +11,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
 {
     class OperandManager
     {
-        private Dictionary<AstOperand, string> _locals;
+        private readonly Dictionary<AstOperand, string> _locals;
 
         public OperandManager()
         {

src/Ryujinx.Graphics.Shader/CodeGen/Spirv/Declarations.cs

@@ -13,8 +13,6 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
 {
     static class Declarations
     {
-        private static readonly string[] _stagePrefixes = { "cp", "vp", "tcp", "tep", "gp", "fp" };
-
         public static void DeclareParameters(CodeGenContext context, StructuredFunction function)
         {
             DeclareParameters(context, function.InArguments, 0);
@@ -192,7 +190,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
                     SamplerType.Texture3D => Dim.Dim3D,
                     SamplerType.TextureCube => Dim.Cube,
                     SamplerType.TextureBuffer => Dim.Buffer,
-                    _ => throw new InvalidOperationException($"Invalid sampler type \"{sampler.Type & SamplerType.Mask}\".")
+                    _ => throw new InvalidOperationException($"Invalid sampler type \"{sampler.Type & SamplerType.Mask}\"."),
                 };
 
                 var imageType = context.TypeImage(
@@ -519,10 +517,5 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
                 : (isOutput ? context.Outputs : context.Inputs);
             dict.Add(ioDefinition, spvVar);
         }
-
-        private static string GetStagePrefix(ShaderStage stage)
-        {
-            return _stagePrefixes[(int)stage];
-        }
     }
 }

src/Ryujinx.Graphics.Shader/StructuredIr/TextureDefinition.cs

@@ -24,4 +24,4 @@ namespace Ryujinx.Graphics.Shader
             return new TextureDefinition(Set, Binding, Name, Type, Format, Flags | flag);
         }
     }
-}
+}

src/Ryujinx.Graphics.Shader/TextureDescriptor.cs

@@ -1,6 +1,6 @@
 namespace Ryujinx.Graphics.Shader
 {
-    public struct TextureDescriptor
+    public readonly struct TextureDescriptor
     {
         // New fields should be added to the end of the struct to keep disk shader cache compatibility.
 

src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs

@@ -266,7 +266,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                 {
                     AccurateType = accurateType,
                     Type = type,
-                    UsageFlags = usageFlags
+                    UsageFlags = usageFlags,
                 };
 
                 int binding;

src/Ryujinx.Graphics.Texture/Astc/AstcDecoder.cs

@@ -889,7 +889,7 @@ namespace Ryujinx.Graphics.Texture.Astc
                                         0 => 0,
                                         1 => 32,
                                         2 => 63,
-                                        _ => 0
+                                        _ => 0,
                                     };
 
                                     break;
@@ -942,7 +942,7 @@ namespace Ryujinx.Graphics.Texture.Astc
                                         2 => 32,
                                         3 => 47,
                                         4 => 63,
-                                        _ => 0
+                                        _ => 0,
                                     };
 
                                     break;

src/Ryujinx.Graphics.Texture/Astc/IntegerEncoded.cs

@@ -12,7 +12,7 @@ namespace Ryujinx.Graphics.Texture.Astc
         {
             JustBits,
             Quint,
-            Trit
+            Trit,
         }
 
         readonly EIntegerEncoding _encoding;
@@ -162,7 +162,7 @@ namespace Ryujinx.Graphics.Texture.Astc
                 IntegerEncoded intEncoded = new(EIntegerEncoding.Quint, numberBitsPerValue)
                 {
                     BitValue = m[i],
-                    QuintValue = encodings[i]
+                    QuintValue = encodings[i],
                 };
 
                 listIntegerEncoded.Add(ref intEncoded);
@@ -309,7 +309,7 @@ namespace Ryujinx.Graphics.Texture.Astc
             2, 1, 1, 1, 2, 1, 1, 2, 1, 2, 0, 2, 1, 1, 2,
             1, 2, 1, 1, 2, 2, 2, 1, 1, 2, 2, 1, 2, 1, 2,
             0, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-            2, 1, 2, 2, 2
+            2, 1, 2, 2, 2,
         };
 
         private static ReadOnlySpan<byte> QuintEncodings => new byte[]
@@ -339,7 +339,7 @@ namespace Ryujinx.Graphics.Texture.Astc
             0, 1, 4, 1, 1, 4, 0, 2, 3, 1, 2, 3, 2, 2, 3,
             3, 2, 3, 4, 2, 3, 2, 4, 3, 0, 2, 4, 1, 2, 4,
             0, 3, 3, 1, 3, 3, 2, 3, 3, 3, 3, 3, 4, 3, 3,
-            3, 4, 3, 0, 3, 4, 1, 3, 4
+            3, 4, 3, 0, 3, 4, 1, 3, 4,
         };
     }
 }

src/Ryujinx.Graphics.Texture/ETC2Decoder.cs

@@ -21,12 +21,12 @@ namespace Ryujinx.Graphics.Texture
             new int[] { 18, 60, -18, -60 },
             new int[] { 24, 80, -24, -80 },
             new int[] { 33, 106, -33, -106 },
-            new int[] { 47, 183, -47, -183 }
+            new int[] { 47, 183, -47, -183 },
         };
 
         private static readonly int[] _etc2Lut =
         {
-            3, 6, 11, 16, 23, 32, 41, 64
+            3, 6, 11, 16, 23, 32, 41, 64,
         };
 
         private static readonly int[][] _etc2AlphaLut =
@@ -46,7 +46,7 @@ namespace Ryujinx.Graphics.Texture
             new int[] { -3, -4, -7, -10, 2, 3, 6, 9 },
             new int[] { -1, -2, -3, -10, 0, 1, 2, 9 },
             new int[] { -4, -6, -8, -9, 3, 5, 7, 8 },
-            new int[] { -3, -5, -7, -9, 2, 4, 6, 8 }
+            new int[] { -3, -5, -7, -9, 2, 4, 6, 8 },
         };
 
         public static byte[] DecodeRgb(ReadOnlySpan<byte> data, int width, int height, int depth, int levels, int layers)

src/Ryujinx.Graphics.Texture/Encoders/BC7Encoder.cs

@@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.Texture.Encoders
 
         private static readonly int[] _mostFrequentPartitions = new int[]
         {
-            0, 13, 2, 1, 15, 14, 10, 23
+            0, 13, 2, 1, 15, 14, 10, 23,
         };
 
         private static Block CompressBlock(ReadOnlySpan<byte> data, int x, int y, int width, int height, bool fastMode)
@@ -233,7 +233,7 @@ namespace Ryujinx.Graphics.Texture.Encoders
                     1 => new RgbaColor8(255, 0, 0, 0).ToUInt32(),
                     2 => new RgbaColor8(0, 255, 0, 0).ToUInt32(),
                     3 => new RgbaColor8(0, 0, 255, 0).ToUInt32(),
-                    _ => new RgbaColor8(0, 0, 0, 255).ToUInt32()
+                    _ => new RgbaColor8(0, 0, 0, 255).ToUInt32(),
                 };
             }
             else

src/Ryujinx.Graphics.Texture/Encoders/EncodeMode.cs

@@ -5,6 +5,6 @@
         Fast,
         Exhaustive,
         ModeMask = 0xff,
-        Multithreaded = 1 << 8
+        Multithreaded = 1 << 8,
     }
 }

src/Ryujinx.Graphics.Texture/LayoutConverter.cs

@@ -89,7 +89,7 @@ namespace Ryujinx.Graphics.Texture
                 8 => Convert<ulong>(dst, data),
                 12 => Convert<Bpp12Pixel>(dst, data),
                 16 => Convert<Vector128<byte>>(dst, data),
-                _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format.")
+                _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format."),
             };
         }
 
@@ -240,7 +240,7 @@ namespace Ryujinx.Graphics.Texture
                     8 => Convert<ulong>(output, data),
                     12 => Convert<Bpp12Pixel>(output, data),
                     16 => Convert<Vector128<byte>>(output, data),
-                    _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format.")
+                    _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format."),
                 };
             }
             return output;
@@ -359,7 +359,7 @@ namespace Ryujinx.Graphics.Texture
                 8 => Convert<ulong>(dst, data),
                 12 => Convert<Bpp12Pixel>(dst, data),
                 16 => Convert<Vector128<byte>>(dst, data),
-                _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format.")
+                _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format."),
             };
         }
 
@@ -504,7 +504,7 @@ namespace Ryujinx.Graphics.Texture
                     8 => Convert<ulong>(output, data),
                     12 => Convert<Bpp12Pixel>(output, data),
                     16 => Convert<Vector128<byte>>(output, data),
-                    _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format.")
+                    _ => throw new NotSupportedException($"Unable to convert ${bytesPerPixel} bpp pixel format."),
                 };
             }
 

src/Ryujinx.Graphics.Texture/Utils/BC67Tables.cs

@@ -11,21 +11,21 @@
             new BC7ModeInfo(1, 0, 0, 2, 1, 2, 3, 5, 6),
             new BC7ModeInfo(1, 0, 0, 2, 0, 2, 2, 7, 8),
             new BC7ModeInfo(1, 0, 2, 0, 0, 4, 0, 7, 7),
-            new BC7ModeInfo(2, 6, 4, 0, 0, 2, 0, 5, 5)
+            new BC7ModeInfo(2, 6, 4, 0, 0, 2, 0, 5, 5),
         };
 
         public static readonly byte[][] Weights =
         {
             new byte[] { 0, 21, 43, 64 },
             new byte[] { 0, 9, 18, 27, 37, 46, 55, 64 },
-            new byte[] { 0, 4, 9, 13, 17, 21, 26, 30, 34, 38, 43, 47, 51, 55, 60, 64 }
+            new byte[] { 0, 4, 9, 13, 17, 21, 26, 30, 34, 38, 43, 47, 51, 55, 60, 64 },
         };
 
         public static readonly byte[][] InverseWeights =
         {
             new byte[] { 64, 43, 21, 0 },
             new byte[] { 64, 55, 46, 37, 27, 18, 9, 0 },
-            new byte[] { 64, 60, 55, 51, 47, 43, 38, 34, 30, 26, 21, 17, 13, 9, 4, 0 }
+            new byte[] { 64, 60, 55, 51, 47, 43, 38, 34, 30, 26, 21, 17, 13, 9, 4, 0 },
         };
 
         public static readonly byte[][][] FixUpIndices = new byte[3][][]
@@ -47,7 +47,7 @@
                 new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 },
                 new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 },
                 new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 },
-                new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }
+                new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 }, new byte[] {  0,  0,  0 },
             },
             new byte[64][]
             {
@@ -66,7 +66,7 @@
                 new byte[] {  0,  6,  0 }, new byte[] {  0,  2,  0 }, new byte[] {  0,  6,  0 }, new byte[] {  0,  8,  0 },
                 new byte[] {  0, 15,  0 }, new byte[] {  0, 15,  0 }, new byte[] {  0,  2,  0 }, new byte[] {  0,  2,  0 },
                 new byte[] {  0, 15,  0 }, new byte[] {  0, 15,  0 }, new byte[] {  0, 15,  0 }, new byte[] {  0, 15,  0 },
-                new byte[] {  0, 15,  0 }, new byte[] {  0,  2,  0 }, new byte[] {  0,  2,  0 }, new byte[] {  0, 15,  0 }
+                new byte[] {  0, 15,  0 }, new byte[] {  0,  2,  0 }, new byte[] {  0,  2,  0 }, new byte[] {  0, 15,  0 },
             },
             new byte[64][]
             {
@@ -85,8 +85,8 @@
                 new byte[] {  0,  3, 15 }, new byte[] {  0, 15,  3 }, new byte[] {  0,  5, 15 }, new byte[] {  0,  5, 15 },
                 new byte[] {  0,  5, 15 }, new byte[] {  0,  8, 15 }, new byte[] {  0,  5, 15 }, new byte[] {  0, 10, 15 },
                 new byte[] {  0,  5, 15 }, new byte[] {  0, 10, 15 }, new byte[] {  0,  8, 15 }, new byte[] {  0, 13, 15 },
-                new byte[] {  0, 15,  3 }, new byte[] {  0, 12, 15 }, new byte[] {  0,  3, 15 }, new byte[] {  0,  3,  8 }
-            }
+                new byte[] {  0, 15,  3 }, new byte[] {  0, 12, 15 }, new byte[] {  0,  3, 15 }, new byte[] {  0,  3,  8 },
+            },
         };
 
         public static readonly byte[][][] PartitionTable = new byte[3][][]
@@ -156,7 +156,7 @@
                 new byte[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 60
                 new byte[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 61
                 new byte[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 62
-                new byte[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }  // 63
+                new byte[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // 63
             },
             new byte[64][]
             {
@@ -223,7 +223,7 @@
                 new byte[16] { 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 }, // 60
                 new byte[16] { 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0 }, // 61
                 new byte[16] { 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0 }, // 62
-                new byte[16] { 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1 }  // 63
+                new byte[16] { 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1 }, // 63
             },
             new byte[64][]
             {
@@ -290,8 +290,8 @@
                 new byte[16] { 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 1 }, // 60
                 new byte[16] { 0, 2, 2, 2, 1, 2, 2, 2, 0, 2, 2, 2, 1, 2, 2, 2 }, // 61
                 new byte[16] { 0, 1, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 }, // 62
-                new byte[16] { 0, 1, 1, 1, 2, 0, 1, 1, 2, 2, 0, 1, 2, 2, 2, 0 }  // 63
-            }
+                new byte[16] { 0, 1, 1, 1, 2, 0, 1, 1, 2, 2, 0, 1, 2, 2, 2, 0 }, // 63
+            },
         };
     }
 }

src/Ryujinx.Graphics.Texture/Utils/BC67Utils.cs

@@ -1199,7 +1199,7 @@ namespace Ryujinx.Graphics.Texture.Utils
 
             RgbaColor32 weightV = new(colorWeight)
             {
-                A = alphaWeight
+                A = alphaWeight,
             };
             RgbaColor32 invWeightV = new RgbaColor32(64) - weightV;
 

src/Ryujinx.Graphics.Texture/Utils/RgbaColor8.cs

@@ -77,7 +77,7 @@ namespace Ryujinx.Graphics.Texture.Utils
                 1 => G,
                 2 => B,
                 3 => A,
-                _ => throw new ArgumentOutOfRangeException(nameof(index))
+                _ => throw new ArgumentOutOfRangeException(nameof(index)),
             };
         }
     }

src/Ryujinx.Graphics.Vic/Image/SurfaceReader.cs

@@ -417,7 +417,7 @@ namespace Ryujinx.Graphics.Vic.Image
                 0 => offsets.LumaOffset,
                 1 => offsets.ChromaUOffset,
                 2 => offsets.ChromaVOffset,
-                _ => throw new ArgumentOutOfRangeException(nameof(plane))
+                _ => throw new ArgumentOutOfRangeException(nameof(plane)),
             };
         }
 

src/Ryujinx.Graphics.Vic/Types/DeinterlaceMode.cs

@@ -7,6 +7,6 @@ namespace Ryujinx.Graphics.Vic.Types
         Bob,
         NewBob,
         Disi1,
-        WeaveLumaBobFieldChroma
+        WeaveLumaBobFieldChroma,
     }
 }

src/Ryujinx.Graphics.Vic/Types/FrameFormat.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Vic.Types
         TopFieldChromaBottom,
         BottomFieldChromaTop,
         SubPicTopFieldChromaBottom,
-        SubPicBottomFieldChromaTop
+        SubPicBottomFieldChromaTop,
     }
 
     static class FrameFormatExtensions

src/Ryujinx.Graphics.Vic/Types/PixelFormat.cs

@@ -76,6 +76,6 @@
         Y8___U8___V8_N422R,
         Y8___U8___V8_N420,
         U8,
-        V8
+        V8,
     }
 }

src/Ryujinx.Graphics.Vic/VicDevice.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.Graphics.Vic
             _rm = new ResourceManager(gmm, new BufferPool<Pixel>(), new BufferPool<byte>());
             _state = new DeviceState<VicRegisters>(new Dictionary<string, RwCallback>
             {
-                { nameof(VicRegisters.Execute), new RwCallback(Execute, null) }
+                { nameof(VicRegisters.Execute), new RwCallback(Execute, null) },
             });
         }
 

src/Ryujinx.Graphics.Video/FrameField.cs

@@ -3,6 +3,6 @@ namespace Ryujinx.Graphics.Video
     public enum FrameField
     {
         Progressive,
-        Interlaced
+        Interlaced,
     }
 }

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);
 
@@ -702,12 +709,14 @@ namespace Ryujinx.Graphics.Vulkan
             return CommandBuffer.Handle == cb.Handle;
         }
 
+#pragma warning disable CA1822 // Mark member as static
         public void SetAlphaTest(bool enable, float reference, CompareOp op)
         {
             // This is currently handled using shader specialization, as Vulkan does not support alpha test.
             // In the future, we may want to use this to write the reference value into the support buffer,
             // to avoid creating one version of the shader per reference value used.
         }
+#pragma warning restore CA1822
 
         public void SetBlendState(AdvancedBlendDescriptor blend)
         {
@@ -935,7 +944,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>