Merge f3e1d9cd50 into 3b5f6170d1

Revert "Vulkan: Feedback loop detection and barriers (#7226 )"
This reverts commit ca59c3f499.
2025-01-24 23:27:47 -06:00 · 2025-01-19 22:46:56 -06:00
517 changed files with 4628 additions and 5199 deletions
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -10,7 +10,7 @@ Make sure your SDK version is higher or equal to the required version specified

 ### Step 2

-Either use `git clone https://github.com/Ryubing/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.
+Either use `git clone https://github.com/GreemDev/Ryujinx` on the command line to clone the repository or use Code --> Download zip button to get the files.

 ### Step 3

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,13 +14,13 @@ We always welcome bug reports, feature proposals and overall feedback. Here are

 ### Finding Existing Issues

-Before filing a new issue, please search our [open issues](https://github.com/Ryubing/Ryujinx/issues) to check if it already exists.
+Before filing a new issue, please search our [open issues](https://github.com/GreemDev/Ryujinx/issues) to check if it already exists.

 If you do find an existing issue, please include your own feedback in the discussion. Do consider upvoting (👍 reaction) the original post, as this helps us prioritize popular issues in our backlog.

 ### Writing a Good Feature Request

-Please review any feature requests already opened to both check it has not already been suggested, and to familiarize yourself with the format. When ready to submit a proposal, please use the [Feature Request issue template](https://github.com/Ryubing/Ryujinx/issues/new?assignees=&labels=&projects=&template=feature_request.yml&title=%5BFeature+Request%5D).
+Please review any feature requests already opened to both check it has not already been suggested, and to familiarize yourself with the format. When ready to submit a proposal, please use the [Feature Request issue template](https://github.com/GreemDev/Ryujinx/issues/new?assignees=&labels=&projects=&template=feature_request.yml&title=%5BFeature+Request%5D).

 ### Writing a Good Bug Report

@@ -34,13 +34,13 @@ Ideally, a bug report should contain the following information:
 * A Ryujinx log file of the run instance where the issue occurred. Log files can be found in `[Executable Folder]/Logs` and are named chronologically.
 * Additional information, e.g. is it a regression from previous versions? Are there any known workarounds?

-When ready to submit a bug report, please use the [Bug Report issue template](https://github.com/Ryubing/Ryujinx/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=%5BBug%5D).
+When ready to submit a bug report, please use the [Bug Report issue template](https://github.com/GreemDev/Ryujinx/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml&title=%5BBug%5D).

 ## Contributing Changes

 Project maintainers will merge changes that both improve the project and meet our standards for code quality.

-The [Pull Request Guide](docs/workflow/pr-guide.md) and [License](https://github.com/Ryubing/Ryujinx/blob/master/LICENSE.txt) docs define additional guidance.
+The [Pull Request Guide](docs/workflow/pr-guide.md) and [License](https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt) docs define additional guidance.

 ### DOs and DON'Ts

@@ -74,14 +74,14 @@ We use and recommend the following workflow:
 3. In your fork, create a branch off of main (`git checkout -b mybranch`).
    - Branches are useful since they isolate your changes from incoming changes from upstream. They also enable you to create multiple PRs from the same fork.
 4. Make and commit your changes to your branch.
-    - [Build Instructions](https://github.com/Ryubing/Ryujinx/blob/master/COMPILING.md) explains how to build and test.
+    - [Build Instructions](https://github.com/GreemDev/Ryujinx/blob/master/COMPILING.md) explains how to build and test.
    - Commit messages should be clear statements of action and intent.
 6. Build the repository with your changes.
    - Make sure that the builds are clean.
    - Make sure that `dotnet format` has been run and any corrections tested and committed.
 7. Create a pull request (PR) against the Ryujinx/Ryujinx repository's **main** branch.
    - State in the description what issue or improvement your change is addressing.
-    - Check if all the Continuous Integration checks are passing. Refer to [Actions](https://github.com/Ryubing/Ryujinx/actions) to check for outstanding errors.
+    - Check if all the Continuous Integration checks are passing. Refer to [Actions](https://github.com/GreemDev/Ryujinx/actions) to check for outstanding errors.
 8. Wait for feedback or approval of your changes from the core development team
    - Details about the pull request [review procedure](docs/workflow/pr-guide.md).
 9. When the team members have signed off, and all checks are green, your PR will be merged.
@@ -90,7 +90,7 @@ We use and recommend the following workflow:

 ### Good First Issues

-The team marks the most straightforward issues as [good first issues](https://github.com/Ryubing/Ryujinx/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). This set of issues is the place to start if you are interested in contributing but new to the codebase.
+The team marks the most straightforward issues as [good first issues](https://github.com/GreemDev/Ryujinx/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). This set of issues is the place to start if you are interested in contributing but new to the codebase.

 ### Commit Messages

@@ -113,7 +113,7 @@ Also do your best to factor commits appropriately, not too large with unrelated

 ### PR - CI Process

-The [Ryujinx continuous integration](https://github.com/Ryubing/Ryujinx/actions) (CI) system will automatically perform the required builds and run tests (including the ones you are expected to run) for PRs. Builds and test runs must be clean or have bugs properly filed against flaky/unexpected failures that are unrelated to your change.
+The [Ryujinx continuous integration](https://github.com/GreemDev/Ryujinx/actions) (CI) system will automatically perform the required builds and run tests (including the ones you are expected to run) for PRs. Builds and test runs must be clean or have bugs properly filed against flaky/unexpected failures that are unrelated to your change.

 If the CI build fails for any reason, the PR actions tab should be consulted for further information on the failure. There are a few usual suspects for such a failure:
 * `dotnet format` has not been run on the PR and has outstanding stylistic issues.
@@ -134,5 +134,5 @@ Ryujinx uses some implementations and frameworks from other projects. The follow

 - The license of the file is [permissive](https://en.wikipedia.org/wiki/Permissive_free_software_licence).
 - The license of the file is left in-tact.
- The contribution is correctly attributed in the [3rd party notices](https://github.com/Ryubing/Ryujinx/blob/master/distribution/legal/THIRDPARTY.md) file in the repository, as needed.
+- The contribution is correctly attributed in the [3rd party notices](https://github.com/GreemDev/Ryujinx/blob/master/distribution/legal/THIRDPARTY.md) file in the repository, as needed.

--- a/README.md
+++ b/README.md
@@ -7,11 +7,11 @@
          
 # Ryujinx
          
-[![Release workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/release.yml)
-[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/Ryubing/Ryujinx/releases/latest)
+[![Release workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/release.yml)
+[![Latest release](https://img.shields.io/github/v/release/GreemDev/Ryujinx)](https://github.com/GreemDev/Ryujinx/releases/latest)
  <br>
-[![Canary workflow](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/Ryubing/Ryujinx/actions/workflows/canary.yml)
-[![Latest canary release](https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary)](https://github.com/Ryubing/Ryujinx-Canary/releases/latest)
+[![Canary workflow](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml/badge.svg)](https://github.com/GreemDev/Ryujinx/actions/workflows/canary.yml)
+[![Latest canary release](https://img.shields.io/github/v/release/GreemDev/Ryujinx-Canary?label=canary)](https://github.com/GreemDev/Ryujinx-Canary/releases/latest)
        </td>
    </tr>
 </table>
@@ -20,7 +20,7 @@
  Ryujinx is an open-source Nintendo Switch emulator, originally created by gdkchan, written in C#.
  This emulator aims at providing excellent accuracy and performance, a user-friendly interface and consistent builds.
  It was written from scratch and development on the project began in September 2017.
-  Ryujinx is available on GitHub under the <a href="https://github.com/Ryubing/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
+  Ryujinx is available on GitHub under the <a href="https://github.com/GreemDev/Ryujinx/blob/master/LICENSE.txt" target="_blank">MIT license</a>.
  <br />
 </p>
 <p align="center">
@@ -30,7 +30,7 @@
  <br>
  This is not a Ryujinx revival project. This is not a Phoenix project.
  <br>
-  Guides and documentation can be found on the <a href="https://github.com/Ryubing/Ryujinx/wiki">Wiki tab</a>.
+  Guides and documentation can be found on the <a href="https://github.com/GreemDev/Ryujinx/wiki">Wiki tab</a>.
 </p>
 <p align="center">
  If you would like a more preservative fork of Ryujinx, check out <a href="https://github.com/ryujinx-mirror/ryujinx">ryujinx-mirror</a>.
@@ -58,13 +58,13 @@ Stable builds are made every so often, based on the `master` branch, that then g
 These stable builds exist so that the end user can get a more **enjoyable and stable experience**.
 They are released every month or so, to ensure consistent updates, while not being an annoying amount of individual updates to download over the course of that month.

-You can find the latest stable release [here](https://github.com/Ryubing/Ryujinx/releases/latest).
+You can find the latest stable release [here](https://github.com/GreemDev/Ryujinx/releases/latest).

 Canary builds are compiled automatically for each commit on the `master` branch.
 While we strive to ensure optimal stability and performance prior to pushing an update, these builds **may be unstable or completely broken**.
 These canary builds are only recommended for experienced users.

-You can find the latest canary release [here](https://github.com/Ryubing/Ryujinx-Canary/releases/latest).
+You can find the latest canary release [here](https://github.com/GreemDev/Ryujinx-Canary/releases/latest).

 ## Documentation

--- a/assets/amiibo/Amiibo.json
+++ b/assets/amiibo/Amiibo.json
--- a/docs/workflow/pr-guide.md
+++ b/docs/workflow/pr-guide.md
@@ -18,13 +18,13 @@ To merge pull requests, you must have write permissions in the repository.

 ## Pull Request Ownership

-Every pull request will automatically have labels and reviewers assigned. The label not only indicates the code segment which the change touches but also the area reviewers to be assigned.
+Every pull request will have automatically have labels and reviewers assigned. The label not only indicates the code segment which the change touches but also the area reviewers to be assigned.

 If during the code review process a merge conflict occurs, the PR author is responsible for its resolution. Help will be provided if necessary although GitHub makes this easier by allowing simple conflict resolution using the [conflict-editor](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github).

 ## Pull Request Builds

-When submitting a PR to the `Ryubing/Ryujinx` repository, various builds will run validating many areas to ensure we keep developer productivity and product quality high. These various workflows can be tracked in the [Actions](https://github.com/Ryubing/Ryujinx/actions) tab of the repository. If the job continues to completion, the build artifacts will be uploaded and posted as a comment in the PR discussion.
+When submitting a PR to the `GreemDev/Ryujinx` repository, various builds will run validating many areas to ensure we keep developer productivity and product quality high. These various workflows can be tracked in the [Actions](https://github.com/GreemDev/Ryujinx/actions) tab of the repository. If the job continues to completion, the build artifacts will be uploaded and posted as a comment in the PR discussion.

 ## Review Turnaround Times

@@ -42,7 +42,7 @@ Anyone with write access can merge a pull request manually when the following co

 * The PR has been approved by two reviewers and any other objections are addressed.
    * You can request follow up reviews from the original reviewers if they requested changes.
-* The PR successfully builds and passes all tests in the Continuous Integration (CI) system. In case of failures, refer to the [Actions](https://github.com/Ryubing/Ryujinx/actions) tab of your PR.
+* The PR successfully builds and passes all tests in the Continuous Integration (CI) system. In case of failures, refer to the [Actions](https://github.com/GreemDev/Ryujinx/actions) tab of your PR.

 Typically, PRs are merged as one commit (squash merges). It creates a simpler history than a Merge Commit. "Special circumstances" are rare, and typically mean that there are a series of cleanly separated changes that will be too hard to understand if squashed together, or for some reason we want to preserve the ability to dissect them.

--- a/src/ARMeilleure/CodeGen/Arm64/Arm64Optimizer.cs
+++ b/src/ARMeilleure/CodeGen/Arm64/Arm64Optimizer.cs
@@ -13,13 +13,13 @@ namespace ARMeilleure.CodeGen.Arm64

        public static void RunPass(ControlFlowGraph cfg)
        {
-            Dictionary<ulong, Operand> constants = new();
+            var constants = new Dictionary<ulong, Operand>();

            Operand GetConstantCopy(BasicBlock block, Operation operation, Operand source)
            {
                // If the constant has many uses, we also force a new constant mov to be added, in order
                // to avoid overflow of the counts field (that is limited to 16 bits).
-                if (!constants.TryGetValue(source.Value, out Operand constant) || constant.UsesCount > MaxConstantUses)
+                if (!constants.TryGetValue(source.Value, out var constant) || constant.UsesCount > MaxConstantUses)
                {
                    constant = Local(source.Type);

--- a/src/ARMeilleure/CodeGen/Arm64/Assembler.cs
+++ b/src/ARMeilleure/CodeGen/Arm64/Assembler.cs
@@ -123,7 +123,7 @@ namespace ARMeilleure.CodeGen.Arm64

        public void Cset(Operand rd, ArmCondition condition)
        {
-            Operand zr = Factory.Register(ZrRegister, RegisterType.Integer, rd.Type);
+            var zr = Factory.Register(ZrRegister, RegisterType.Integer, rd.Type);
            Csinc(rd, zr, zr, (ArmCondition)((int)condition ^ 1));
        }

--- a/src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
+++ b/src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
@@ -91,7 +91,7 @@ namespace ARMeilleure.CodeGen.Arm64

            long target = _stream.Position;

-            if (_pendingBranches.TryGetValue(block, out List<(ArmCondition Condition, long BranchPos)> list))
+            if (_pendingBranches.TryGetValue(block, out var list))
            {
                foreach ((ArmCondition condition, long branchPos) in list)
                {
@@ -119,7 +119,7 @@ namespace ARMeilleure.CodeGen.Arm64
            }
            else
            {
-                if (!_pendingBranches.TryGetValue(target, out List<(ArmCondition Condition, long BranchPos)> list))
+                if (!_pendingBranches.TryGetValue(target, out var list))
                {
                    list = new List<(ArmCondition, long)>();
                    _pendingBranches.Add(target, list);
--- a/src/ARMeilleure/CodeGen/Arm64/CodeGenerator.cs
+++ b/src/ARMeilleure/CodeGen/Arm64/CodeGenerator.cs
@@ -322,7 +322,7 @@ namespace ARMeilleure.CodeGen.Arm64

            Debug.Assert(comp.Kind == OperandKind.Constant);

-            ArmCondition cond = ((Comparison)comp.AsInt32()).ToArmCondition();
+            var cond = ((Comparison)comp.AsInt32()).ToArmCondition();

            GenerateCompareCommon(context, operation);

@@ -354,7 +354,7 @@ namespace ARMeilleure.CodeGen.Arm64
            Debug.Assert(dest.Type == OperandType.I32);
            Debug.Assert(comp.Kind == OperandKind.Constant);

-            ArmCondition cond = ((Comparison)comp.AsInt32()).ToArmCondition();
+            var cond = ((Comparison)comp.AsInt32()).ToArmCondition();

            GenerateCompareCommon(context, operation);

--- a/src/ARMeilleure/CodeGen/Arm64/PreAllocator.cs
+++ b/src/ARMeilleure/CodeGen/Arm64/PreAllocator.cs
@@ -847,7 +847,7 @@ namespace ARMeilleure.CodeGen.Arm64

                        Debug.Assert(comp.Kind == OperandKind.Constant);

-                        Comparison compType = (Comparison)comp.AsInt32();
+                        var compType = (Comparison)comp.AsInt32();

                        return compType == Comparison.Equal || compType == Comparison.NotEqual;
                    }
--- a/src/ARMeilleure/CodeGen/Linking/RelocInfo.cs
+++ b/src/ARMeilleure/CodeGen/Linking/RelocInfo.cs
@@ -10,7 +10,7 @@ namespace ARMeilleure.CodeGen.Linking
        /// <summary>
        /// Gets an empty <see cref="RelocInfo"/>.
        /// </summary>
-        public static RelocInfo Empty { get; } = new(null);
+        public static RelocInfo Empty { get; } = new RelocInfo(null);

        private readonly RelocEntry[] _entries;

--- a/src/ARMeilleure/CodeGen/RegisterAllocators/LinearScanAllocator.cs
+++ b/src/ARMeilleure/CodeGen/RegisterAllocators/LinearScanAllocator.cs
@@ -115,7 +115,7 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
        {
            NumberLocals(cfg, regMasks.RegistersCount);

-            AllocationContext context = new(stackAlloc, regMasks, _intervals.Count);
+            var context = new AllocationContext(stackAlloc, regMasks, _intervals.Count);

            BuildIntervals(cfg, context);

@@ -839,7 +839,7 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
                        {
                            dest.NumberLocal(_intervals.Count);

-                            LiveInterval interval = new(dest);
+                            LiveInterval interval = new LiveInterval(dest);
                            _intervals.Add(interval);

                            SetVisited(dest);
--- a/src/ARMeilleure/CodeGen/RegisterAllocators/LiveIntervalList.cs
+++ b/src/ARMeilleure/CodeGen/RegisterAllocators/LiveIntervalList.cs
@@ -15,12 +15,12 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
        {
            if (_count + 1 > _capacity)
            {
-                Span<LiveInterval> oldSpan = Span;
+                var oldSpan = Span;

                _capacity = Math.Max(4, _capacity * 2);
                _items = Allocators.References.Allocate<LiveInterval>((uint)_capacity);

-                Span<LiveInterval> newSpan = Span;
+                var newSpan = Span;

                oldSpan.CopyTo(newSpan);
            }
--- a/src/ARMeilleure/CodeGen/RegisterAllocators/UseList.cs
+++ b/src/ARMeilleure/CodeGen/RegisterAllocators/UseList.cs
@@ -16,12 +16,12 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
        {
            if (Count + 1 > _capacity)
            {
-                Span<int> oldSpan = Span;
+                var oldSpan = Span;

                _capacity = Math.Max(4, _capacity * 2);
                _items = Allocators.Default.Allocate<int>((uint)_capacity);

-                Span<int> newSpan = Span;
+                var newSpan = Span;

                oldSpan.CopyTo(newSpan);
            }
--- a/src/ARMeilleure/CodeGen/X86/Assembler.cs
+++ b/src/ARMeilleure/CodeGen/X86/Assembler.cs
@@ -1,6 +1,5 @@
 using ARMeilleure.CodeGen.Linking;
 using ARMeilleure.IntermediateRepresentation;
-using Microsoft.IO;
 using Ryujinx.Common.Memory;
 using System;
 using System.Collections.Generic;
@@ -1325,8 +1324,8 @@ namespace ARMeilleure.CodeGen.X86

        public (byte[], RelocInfo) GetCode()
        {
-            Span<Jump> jumps = CollectionsMarshal.AsSpan(_jumps);
-            Span<Reloc> relocs = CollectionsMarshal.AsSpan(_relocs);
+            var jumps = CollectionsMarshal.AsSpan(_jumps);
+            var relocs = CollectionsMarshal.AsSpan(_relocs);

            // Write jump relative offsets.
            bool modified;
@@ -1411,13 +1410,13 @@ namespace ARMeilleure.CodeGen.X86
            // Write the code, ignoring the dummy bytes after jumps, into a new stream.
            _stream.Seek(0, SeekOrigin.Begin);

-            using RecyclableMemoryStream codeStream = MemoryStreamManager.Shared.GetStream();
-            Assembler assembler = new(codeStream, HasRelocs);
+            using var codeStream = MemoryStreamManager.Shared.GetStream();
+            var assembler = new Assembler(codeStream, HasRelocs);

            bool hasRelocs = HasRelocs;
            int relocIndex = 0;
            int relocOffset = 0;
-            RelocEntry[] relocEntries = hasRelocs
+            var relocEntries = hasRelocs
                ? new RelocEntry[relocs.Length]
                : Array.Empty<RelocEntry>();

@@ -1470,8 +1469,8 @@ namespace ARMeilleure.CodeGen.X86

            _stream.CopyTo(codeStream);

-            byte[] code = codeStream.ToArray();
-            RelocInfo relocInfo = new(relocEntries);
+            var code = codeStream.ToArray();
+            var relocInfo = new RelocInfo(relocEntries);

            return (code, relocInfo);
        }
--- a/src/ARMeilleure/CodeGen/X86/CodeGenerator.cs
+++ b/src/ARMeilleure/CodeGen/X86/CodeGenerator.cs
@@ -623,7 +623,7 @@ namespace ARMeilleure.CodeGen.X86

            Debug.Assert(comp.Kind == OperandKind.Constant);

-            X86Condition cond = ((Comparison)comp.AsInt32()).ToX86Condition();
+            var cond = ((Comparison)comp.AsInt32()).ToX86Condition();

            GenerateCompareCommon(context, operation);

@@ -661,7 +661,7 @@ namespace ARMeilleure.CodeGen.X86
            Debug.Assert(dest.Type == OperandType.I32);
            Debug.Assert(comp.Kind == OperandKind.Constant);

-            X86Condition cond = ((Comparison)comp.AsInt32()).ToX86Condition();
+            var cond = ((Comparison)comp.AsInt32()).ToX86Condition();

            GenerateCompareCommon(context, operation);

--- a/src/ARMeilleure/CodeGen/X86/HardwareCapabilities.cs
+++ b/src/ARMeilleure/CodeGen/X86/HardwareCapabilities.cs
@@ -53,7 +53,7 @@ namespace ARMeilleure.CodeGen.X86

            memGetXcr0.Reprotect(0, (ulong)asmGetXcr0.Length, MemoryPermission.ReadAndExecute);

-            GetXcr0 fGetXcr0 = Marshal.GetDelegateForFunctionPointer<GetXcr0>(memGetXcr0.Pointer);
+            var fGetXcr0 = Marshal.GetDelegateForFunctionPointer<GetXcr0>(memGetXcr0.Pointer);

            return fGetXcr0();
        }
--- a/src/ARMeilleure/CodeGen/X86/PreAllocator.cs
+++ b/src/ARMeilleure/CodeGen/X86/PreAllocator.cs
@@ -759,7 +759,7 @@ namespace ARMeilleure.CodeGen.X86

                        Debug.Assert(comp.Kind == OperandKind.Constant);

-                        Comparison compType = (Comparison)comp.AsInt32();
+                        var compType = (Comparison)comp.AsInt32();

                        return compType == Comparison.Equal || compType == Comparison.NotEqual;
                    }
--- a/src/ARMeilleure/CodeGen/X86/X86Optimizer.cs
+++ b/src/ARMeilleure/CodeGen/X86/X86Optimizer.cs
@@ -13,13 +13,13 @@ namespace ARMeilleure.CodeGen.X86

        public static void RunPass(ControlFlowGraph cfg)
        {
-            Dictionary<ulong, Operand> constants = new();
+            var constants = new Dictionary<ulong, Operand>();

            Operand GetConstantCopy(BasicBlock block, Operation operation, Operand source)
            {
                // If the constant has many uses, we also force a new constant mov to be added, in order
                // to avoid overflow of the counts field (that is limited to 16 bits).
-                if (!constants.TryGetValue(source.Value, out Operand constant) || constant.UsesCount > MaxConstantUses)
+                if (!constants.TryGetValue(source.Value, out var constant) || constant.UsesCount > MaxConstantUses)
                {
                    constant = Local(source.Type);

--- a/src/ARMeilleure/Common/BitMap.cs
+++ b/src/ARMeilleure/Common/BitMap.cs
@@ -129,13 +129,13 @@ namespace ARMeilleure.Common

            if (count > _count)
            {
-                long* oldMask = _masks;
-                Span<long> oldSpan = new(_masks, _count);
+                var oldMask = _masks;
+                var oldSpan = new Span<long>(_masks, _count);

                _masks = _allocator.Allocate<long>((uint)count);
                _count = count;

-                Span<long> newSpan = new(_masks, _count);
+                var newSpan = new Span<long>(_masks, _count);

                oldSpan.CopyTo(newSpan);
                newSpan[oldSpan.Length..].Clear();
--- a/src/ARMeilleure/Common/EntryTable.cs
+++ b/src/ARMeilleure/Common/EntryTable.cs
@@ -63,7 +63,7 @@ namespace ARMeilleure.Common
                }

                int index = _freeHint++;
-                Span<TEntry> page = GetPage(index);
+                var page = GetPage(index);

                _allocated.Set(index);

@@ -111,7 +111,7 @@ namespace ARMeilleure.Common
                    throw new ArgumentException("Entry at the specified index was not allocated", nameof(index));
                }

-                Span<TEntry> page = GetPage(index);
+                var page = GetPage(index);

                return ref GetValue(page, index);
            }
@@ -136,7 +136,7 @@ namespace ARMeilleure.Common
        /// <returns>Page for the specified <see cref="index"/></returns>
        private unsafe Span<TEntry> GetPage(int index)
        {
-            int pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
+            var pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);

            if (!_pages.TryGetValue(pageIndex, out nint page))
            {
@@ -168,7 +168,7 @@ namespace ARMeilleure.Common
            {
                _allocated.Dispose();

-                foreach (IntPtr page in _pages.Values)
+                foreach (var page in _pages.Values)
                {
                    NativeAllocator.Instance.Free((void*)page);
                }
--- a/src/ARMeilleure/Decoders/OpCode32SimdDupElem.cs
+++ b/src/ARMeilleure/Decoders/OpCode32SimdDupElem.cs
@@ -9,7 +9,7 @@ namespace ARMeilleure.Decoders

        public OpCode32SimdDupElem(InstDescriptor inst, ulong address, int opCode, bool isThumb) : base(inst, address, opCode, isThumb)
        {
-            int opc = (opCode >> 16) & 0xf;
+            var opc = (opCode >> 16) & 0xf;

            if ((opc & 0b1) == 1)
            {
--- a/src/ARMeilleure/Decoders/OpCode32SimdMovGpElem.cs
+++ b/src/ARMeilleure/Decoders/OpCode32SimdMovGpElem.cs
@@ -21,7 +21,7 @@ namespace ARMeilleure.Decoders
            Op = (opCode >> 20) & 0x1;
            U = ((opCode >> 23) & 1) != 0;

-            int opc = (((opCode >> 23) & 1) << 4) | (((opCode >> 21) & 0x3) << 2) | ((opCode >> 5) & 0x3);
+            var opc = (((opCode >> 23) & 1) << 4) | (((opCode >> 21) & 0x3) << 2) | ((opCode >> 5) & 0x3);

            if ((opc & 0b01000) == 0b01000)
            {
--- a/src/ARMeilleure/Decoders/OpCodeAluImm.cs
+++ b/src/ARMeilleure/Decoders/OpCodeAluImm.cs
@@ -20,7 +20,7 @@ namespace ARMeilleure.Decoders
            }
            else if (DataOp == DataOp.Logical)
            {
-                DecoderHelper.BitMask bm = DecoderHelper.DecodeBitMask(opCode, true);
+                var bm = DecoderHelper.DecodeBitMask(opCode, true);

                if (bm.IsUndefined)
                {
--- a/src/ARMeilleure/Decoders/OpCodeBfm.cs
+++ b/src/ARMeilleure/Decoders/OpCodeBfm.cs
@@ -11,7 +11,7 @@ namespace ARMeilleure.Decoders

        public OpCodeBfm(InstDescriptor inst, ulong address, int opCode) : base(inst, address, opCode)
        {
-            DecoderHelper.BitMask bm = DecoderHelper.DecodeBitMask(opCode, false);
+            var bm = DecoderHelper.DecodeBitMask(opCode, false);

            if (bm.IsUndefined)
            {
--- a/src/ARMeilleure/Decoders/Optimizations/TailCallRemover.cs
+++ b/src/ARMeilleure/Decoders/Optimizations/TailCallRemover.cs
@@ -69,7 +69,7 @@ namespace ARMeilleure.Decoders.Optimizations
                }
            }

-            List<Block> newBlocks = new(blocks.Count);
+            var newBlocks = new List<Block>(blocks.Count);

            // Finally, rebuild decoded block list, ignoring blocks outside the contiguous range.
            for (int i = 0; i < blocks.Count; i++)
--- a/src/ARMeilleure/Diagnostics/IRDumper.cs
+++ b/src/ARMeilleure/Diagnostics/IRDumper.cs
@@ -141,7 +141,7 @@ namespace ARMeilleure.Diagnostics
                    break;

                case OperandKind.Memory:
-                    MemoryOperand memOp = operand.GetMemory();
+                    var memOp = operand.GetMemory();

                    _builder.Append('[');

@@ -285,7 +285,7 @@ namespace ARMeilleure.Diagnostics

        public static string GetDump(ControlFlowGraph cfg)
        {
-            IRDumper dumper = new(1);
+            var dumper = new IRDumper(1);

            for (BasicBlock block = cfg.Blocks.First; block != null; block = block.ListNext)
            {
--- a/src/ARMeilleure/Instructions/InstEmitAlu32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitAlu32.cs
@@ -415,7 +415,7 @@ namespace ARMeilleure.Instructions
        {
            IOpCode32AluBf op = (IOpCode32AluBf)context.CurrOp;

-            int msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
+            var msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.

            Operand n = GetIntA32(context, op.Rn);
            Operand res = context.ShiftRightSI(context.ShiftLeft(n, Const(31 - msb)), Const(31 - op.Msb));
@@ -547,7 +547,7 @@ namespace ARMeilleure.Instructions
        {
            IOpCode32AluBf op = (IOpCode32AluBf)context.CurrOp;

-            int msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
+            var msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.

            Operand n = GetIntA32(context, op.Rn);
            Operand res = context.ShiftRightUI(context.ShiftLeft(n, Const(31 - msb)), Const(31 - op.Msb));
--- a/src/ARMeilleure/Instructions/InstEmitFlowHelper.cs
+++ b/src/ARMeilleure/Instructions/InstEmitFlowHelper.cs
@@ -1,5 +1,4 @@
 using ARMeilleure.CodeGen.Linking;
-using ARMeilleure.Common;
 using ARMeilleure.Decoders;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
@@ -194,7 +193,7 @@ namespace ARMeilleure.Instructions

            Operand hostAddress;

-            IAddressTable<ulong> table = context.FunctionTable;
+            var table = context.FunctionTable;

            // If address is mapped onto the function table, we can skip the table walk. Otherwise we fallback
            // onto the dispatch stub.
@@ -219,7 +218,7 @@ namespace ARMeilleure.Instructions

                for (int i = 0; i < table.Levels.Length; i++)
                {
-                    AddressTableLevel level = table.Levels[i];
+                    var level = table.Levels[i];
                    int clearBits = 64 - (level.Index + level.Length);

                    Operand index = context.ShiftLeft(
--- a/src/ARMeilleure/Instructions/InstEmitMemoryEx32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitMemoryEx32.cs
@@ -143,8 +143,8 @@ namespace ARMeilleure.Instructions

            Operand address = context.Copy(GetIntA32(context, op.Rn));

-            bool exclusive = (accType & AccessType.Exclusive) != 0;
-            bool ordered = (accType & AccessType.Ordered) != 0;
+            var exclusive = (accType & AccessType.Exclusive) != 0;
+            var ordered = (accType & AccessType.Ordered) != 0;

            if ((accType & AccessType.Load) != 0)
            {
--- a/src/ARMeilleure/Instructions/InstEmitSimdCmp32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCmp32.cs
@@ -229,7 +229,7 @@ namespace ARMeilleure.Instructions

        private static Operand ZerosOrOnes(ArmEmitterContext context, Operand fromBool, OperandType baseType)
        {
-            Operand ones = (baseType == OperandType.I64) ? Const(-1L) : Const(-1);
+            var ones = (baseType == OperandType.I64) ? Const(-1L) : Const(-1);

            return context.ConditionalSelect(fromBool, ones, Const(baseType, 0L));
        }
--- a/src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs
@@ -118,15 +118,15 @@ namespace ARMeilleure.Instructions
        {
            OpCode32SimdCvtFFixed op = (OpCode32SimdCvtFFixed)context.CurrOp;

-            bool toFixed = op.Opc == 1;
+            var toFixed = op.Opc == 1;
            int fracBits = op.Fbits;
-            bool unsigned = op.U;
+            var unsigned = op.U;

            if (toFixed) // F32 to S32 or U32 (fixed)
            {
                EmitVectorUnaryOpF32(context, (op1) =>
                {
-                    Operand scaledValue = context.Multiply(op1, ConstF(MathF.Pow(2f, fracBits)));
+                    var scaledValue = context.Multiply(op1, ConstF(MathF.Pow(2f, fracBits)));
                    MethodInfo info = unsigned ? typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToU32)) : typeof(SoftFallback).GetMethod(nameof(SoftFallback.SatF32ToS32));

                    return context.Call(info, scaledValue);
@@ -136,7 +136,7 @@ namespace ARMeilleure.Instructions
            {
                EmitVectorUnaryOpI32(context, (op1) =>
                {
-                    Operand floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);
+                    var floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);

                    return context.Multiply(floatValue, ConstF(1f / MathF.Pow(2f, fracBits)));
                }, !unsigned);
--- a/src/ARMeilleure/Instructions/InstEmitSimdMemory32.cs
+++ b/src/ARMeilleure/Instructions/InstEmitSimdMemory32.cs
@@ -87,7 +87,7 @@ namespace ARMeilleure.Instructions
                        {
                            if (op.Replicate)
                            {
-                                int regs = (count > 1) ? 1 : op.Increment;
+                                var regs = (count > 1) ? 1 : op.Increment;
                                for (int reg = 0; reg < regs; reg++)
                                {
                                    int dreg = reg + d;
--- a/src/ARMeilleure/Instructions/SoftFloat.cs
+++ b/src/ARMeilleure/Instructions/SoftFloat.cs
@@ -1538,7 +1538,7 @@ namespace ARMeilleure.Instructions
            }
            else if (MathF.Abs(value) < MathF.Pow(2f, -128))
            {
-                bool overflowToInf = fpcr.GetRoundingMode() switch
+                var overflowToInf = fpcr.GetRoundingMode() switch
                {
                    FPRoundingMode.ToNearest => true,
                    FPRoundingMode.TowardsPlusInfinity => !sign,
@@ -3073,7 +3073,7 @@ namespace ARMeilleure.Instructions
            }
            else if (Math.Abs(value) < Math.Pow(2d, -1024))
            {
-                bool overflowToInf = fpcr.GetRoundingMode() switch
+                var overflowToInf = fpcr.GetRoundingMode() switch
                {
                    FPRoundingMode.ToNearest => true,
                    FPRoundingMode.TowardsPlusInfinity => !sign,
--- a/src/ARMeilleure/IntermediateRepresentation/Operand.cs
+++ b/src/ARMeilleure/IntermediateRepresentation/Operand.cs
@@ -304,7 +304,7 @@ namespace ARMeilleure.IntermediateRepresentation
                ushort newCount = checked((ushort)(count + 1));
                ushort newCapacity = (ushort)Math.Min(capacity * 2, ushort.MaxValue);

-                Span<T> oldSpan = new(data, count);
+                var oldSpan = new Span<T>(data, count);

                capacity = newCapacity;
                data = Allocators.References.Allocate<T>(capacity);
@@ -338,7 +338,7 @@ namespace ARMeilleure.IntermediateRepresentation
                    throw new OverflowException();
                }

-                Span<T> oldSpan = new(data, (int)count);
+                var oldSpan = new Span<T>(data, (int)count);

                capacity = newCapacity;
                data = Allocators.References.Allocate<T>(capacity);
@@ -352,7 +352,7 @@ namespace ARMeilleure.IntermediateRepresentation

        private static void Remove<T>(in T item, ref T* data, ref ushort count) where T : unmanaged
        {
-            Span<T> span = new(data, count);
+            var span = new Span<T>(data, count);

            for (int i = 0; i < span.Length; i++)
            {
@@ -372,7 +372,7 @@ namespace ARMeilleure.IntermediateRepresentation

        private static void Remove<T>(in T item, ref T* data, ref uint count) where T : unmanaged
        {
-            Span<T> span = new(data, (int)count);
+            var span = new Span<T>(data, (int)count);

            for (int i = 0; i < span.Length; i++)
            {
--- a/src/ARMeilleure/Signal/TestMethods.cs
+++ b/src/ARMeilleure/Signal/TestMethods.cs
@@ -22,7 +22,7 @@ namespace ARMeilleure.Signal
        {
            EmitterContext context = new();

-            Operand result = WindowsPartialUnmapHandler.EmitRetryFromAccessViolation(context);
+            var result = WindowsPartialUnmapHandler.EmitRetryFromAccessViolation(context);

            context.Return(result);

@@ -39,7 +39,7 @@ namespace ARMeilleure.Signal
        {
            EmitterContext context = new();

-            Operand result = WindowsPartialUnmapHandler.EmitThreadLocalMapIntGetOrReserve(context, structPtr, context.LoadArgument(OperandType.I32, 0), context.LoadArgument(OperandType.I32, 1));
+            var result = WindowsPartialUnmapHandler.EmitThreadLocalMapIntGetOrReserve(context, structPtr, context.LoadArgument(OperandType.I32, 0), context.LoadArgument(OperandType.I32, 1));

            context.Return(result);

--- a/src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs
+++ b/src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs
@@ -100,13 +100,13 @@ namespace ARMeilleure.Translation.Cache
                return null; // Not found.
            }

-            CodeGen.Unwinding.UnwindInfo unwindInfo = funcEntry.UnwindInfo;
+            var unwindInfo = funcEntry.UnwindInfo;

            int codeIndex = 0;

            for (int index = unwindInfo.PushEntries.Length - 1; index >= 0; index--)
            {
-                UnwindPushEntry entry = unwindInfo.PushEntries[index];
+                var entry = unwindInfo.PushEntries[index];

                switch (entry.PseudoOp)
                {
--- a/src/ARMeilleure/Translation/ControlFlowGraph.cs
+++ b/src/ARMeilleure/Translation/ControlFlowGraph.cs
@@ -47,8 +47,8 @@ namespace ARMeilleure.Translation
        {
            RemoveUnreachableBlocks(Blocks);

-            HashSet<BasicBlock> visited = new();
-            Stack<BasicBlock> blockStack = new();
+            var visited = new HashSet<BasicBlock>();
+            var blockStack = new Stack<BasicBlock>();

            Array.Resize(ref _postOrderBlocks, Blocks.Count);
            Array.Resize(ref _postOrderMap, Blocks.Count);
@@ -88,8 +88,8 @@ namespace ARMeilleure.Translation

        private void RemoveUnreachableBlocks(IntrusiveList<BasicBlock> blocks)
        {
-            HashSet<BasicBlock> visited = new();
-            Queue<BasicBlock> workQueue = new();
+            var visited = new HashSet<BasicBlock>();
+            var workQueue = new Queue<BasicBlock>();

            visited.Add(Entry);
            workQueue.Enqueue(Entry);
--- a/src/ARMeilleure/Translation/PTC/Ptc.cs
+++ b/src/ARMeilleure/Translation/PTC/Ptc.cs
@@ -9,7 +9,6 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Common.Memory;
 using System;
 using System.Buffers.Binary;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -563,7 +562,7 @@ namespace ARMeilleure.Translation.PTC

                    bool isEntryChanged = infoEntry.Hash != ComputeHash(translator.Memory, infoEntry.Address, infoEntry.GuestSize);

-                    if (isEntryChanged || (!infoEntry.HighCq && Profiler.ProfiledFuncs.TryGetValue(infoEntry.Address, out PtcProfiler.FuncProfile value) && value.HighCq))
+                    if (isEntryChanged || (!infoEntry.HighCq && Profiler.ProfiledFuncs.TryGetValue(infoEntry.Address, out var value) && value.HighCq))
                    {
                        infoEntry.Stubbed = true;
                        infoEntry.CodeLength = 0;
@@ -750,8 +749,8 @@ namespace ARMeilleure.Translation.PTC
            UnwindInfo unwindInfo,
            bool highCq)
        {
-            CompiledFunction cFunc = new(code, unwindInfo, RelocInfo.Empty);
-            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
+            var cFunc = new CompiledFunction(code, unwindInfo, RelocInfo.Empty);
+            var gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);

            return new TranslatedFunction(gFunc, gFuncPointer, callCounter, guestSize, highCq);
        }
@@ -788,7 +787,7 @@ namespace ARMeilleure.Translation.PTC

        public void MakeAndSaveTranslations(Translator translator)
        {
-            ConcurrentQueue<(ulong address, PtcProfiler.FuncProfile funcProfile)> profiledFuncsToTranslate = Profiler.GetProfiledFuncsToTranslate(translator.Functions);
+            var profiledFuncsToTranslate = Profiler.GetProfiledFuncsToTranslate(translator.Functions);

            _translateCount = 0;
            _translateTotalCount = profiledFuncsToTranslate.Count;
@@ -832,7 +831,7 @@ namespace ARMeilleure.Translation.PTC

            void TranslateFuncs()
            {
-                while (profiledFuncsToTranslate.TryDequeue(out (ulong address, PtcProfiler.FuncProfile funcProfile) item))
+                while (profiledFuncsToTranslate.TryDequeue(out var item))
                {
                    ulong address = item.address;

@@ -867,11 +866,11 @@ namespace ARMeilleure.Translation.PTC

            Stopwatch sw = Stopwatch.StartNew();

-            foreach (Thread thread in threads)
+            foreach (var thread in threads)
            {
                thread.Start();
            }
-            foreach (Thread thread in threads)
+            foreach (var thread in threads)
            {
                thread.Join();
            }
@@ -945,7 +944,7 @@ namespace ARMeilleure.Translation.PTC
                WriteCode(code.AsSpan());

                // WriteReloc.
-                using BinaryWriter relocInfoWriter = new(_relocsStream, EncodingCache.UTF8NoBOM, true);
+                using var relocInfoWriter = new BinaryWriter(_relocsStream, EncodingCache.UTF8NoBOM, true);

                foreach (RelocEntry entry in relocInfo.Entries)
                {
@@ -955,7 +954,7 @@ namespace ARMeilleure.Translation.PTC
                }

                // WriteUnwindInfo.
-                using BinaryWriter unwindInfoWriter = new(_unwindInfosStream, EncodingCache.UTF8NoBOM, true);
+                using var unwindInfoWriter = new BinaryWriter(_unwindInfosStream, EncodingCache.UTF8NoBOM, true);

                unwindInfoWriter.Write(unwindInfo.PushEntries.Length);

--- a/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
+++ b/src/ARMeilleure/Translation/PTC/PtcProfiler.cs
@@ -111,9 +111,9 @@ namespace ARMeilleure.Translation.PTC

        public ConcurrentQueue<(ulong address, FuncProfile funcProfile)> GetProfiledFuncsToTranslate(TranslatorCache<TranslatedFunction> funcs)
        {
-            ConcurrentQueue<(ulong address, FuncProfile funcProfile)> profiledFuncsToTranslate = new();
+            var profiledFuncsToTranslate = new ConcurrentQueue<(ulong address, FuncProfile funcProfile)>();

-            foreach (KeyValuePair<ulong, FuncProfile> profiledFunc in ProfiledFuncs)
+            foreach (var profiledFunc in ProfiledFuncs)
            {
                if (!funcs.ContainsKey(profiledFunc.Key))
                {
--- a/src/ARMeilleure/Translation/RegisterUsage.cs
+++ b/src/ARMeilleure/Translation/RegisterUsage.cs
@@ -95,7 +95,7 @@ namespace ARMeilleure.Translation
                // This is required because we have a implicit context load at the start of the function,
                // but if there is a jump to the start of the function, the context load would trash the modified values.
                // Here we insert a new entry block that will jump to the existing entry block.
-                BasicBlock newEntry = new(cfg.Blocks.Count);
+                BasicBlock newEntry = new BasicBlock(cfg.Blocks.Count);

                cfg.UpdateEntry(newEntry);
            }
--- a/src/ARMeilleure/Translation/SsaConstruction.cs
+++ b/src/ARMeilleure/Translation/SsaConstruction.cs
@@ -44,10 +44,10 @@ namespace ARMeilleure.Translation

        public static void Construct(ControlFlowGraph cfg)
        {
-            DefMap[] globalDefs = new DefMap[cfg.Blocks.Count];
-            Operand[] localDefs = new Operand[cfg.LocalsCount + RegisterConsts.TotalCount];
+            var globalDefs = new DefMap[cfg.Blocks.Count];
+            var localDefs = new Operand[cfg.LocalsCount + RegisterConsts.TotalCount];

-            Queue<BasicBlock> dfPhiBlocks = new();
+            var dfPhiBlocks = new Queue<BasicBlock>();

            for (BasicBlock block = cfg.Blocks.First; block != null; block = block.ListNext)
            {
--- a/src/ARMeilleure/Translation/Translator.cs
+++ b/src/ARMeilleure/Translation/Translator.cs
@@ -222,7 +222,7 @@ namespace ARMeilleure.Translation

        internal TranslatedFunction Translate(ulong address, ExecutionMode mode, bool highCq, bool singleStep = false)
        {
-            ArmEmitterContext context = new(
+            var context = new ArmEmitterContext(
                Memory,
                CountTable,
                FunctionTable,
@@ -259,10 +259,10 @@ namespace ARMeilleure.Translation

            Logger.EndPass(PassName.RegisterUsage);

-            OperandType retType = OperandType.I64;
-            OperandType[] argTypes = new OperandType[] { OperandType.I64 };
+            var retType = OperandType.I64;
+            var argTypes = new OperandType[] { OperandType.I64 };

-            CompilerOptions options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;
+            var options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;

            if (context.HasPtc && !singleStep)
            {
@@ -521,7 +521,7 @@ namespace ARMeilleure.Translation

            List<TranslatedFunction> functions = Functions.AsList();

-            foreach (TranslatedFunction func in functions)
+            foreach (var func in functions)
            {
                JitCache.Unmap(func.FuncPointer);

@@ -530,7 +530,7 @@ namespace ARMeilleure.Translation

            Functions.Clear();

-            while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
+            while (_oldFuncs.TryDequeue(out var kv))
            {
                JitCache.Unmap(kv.Value.FuncPointer);

@@ -551,7 +551,7 @@ namespace ARMeilleure.Translation
            {
                while (Queue.Count > 0 && Queue.TryDequeue(out RejitRequest request))
                {
-                    if (Functions.TryGetValue(request.Address, out TranslatedFunction func) && func.CallCounter != null)
+                    if (Functions.TryGetValue(request.Address, out var func) && func.CallCounter != null)
                    {
                        Volatile.Write(ref func.CallCounter.Value, 0);
                    }
--- a/src/ARMeilleure/Translation/TranslatorStubs.cs
+++ b/src/ARMeilleure/Translation/TranslatorStubs.cs
@@ -142,7 +142,7 @@ namespace ARMeilleure.Translation
        /// <returns>Generated <see cref="DispatchStub"/></returns>
        private nint GenerateDispatchStub()
        {
-            EmitterContext context = new();
+            var context = new EmitterContext();

            Operand lblFallback = Label();
            Operand lblEnd = Label();
@@ -161,7 +161,7 @@ namespace ARMeilleure.Translation

            for (int i = 0; i < _functionTable.Levels.Length; i++)
            {
-                ref AddressTableLevel level = ref _functionTable.Levels[i];
+                ref var level = ref _functionTable.Levels[i];

                // level.Mask is not used directly because it is more often bigger than 32-bits, so it will not
                // be encoded as an immediate on x86's bitwise and operation.
@@ -185,11 +185,11 @@ namespace ARMeilleure.Translation
            hostAddress = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)), guestAddress);
            context.Tailcall(hostAddress, nativeContext);

-            ControlFlowGraph cfg = context.GetControlFlowGraph();
-            OperandType retType = OperandType.I64;
-            OperandType[] argTypes = new[] { OperandType.I64 };
+            var cfg = context.GetControlFlowGraph();
+            var retType = OperandType.I64;
+            var argTypes = new[] { OperandType.I64 };

-            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();

            return Marshal.GetFunctionPointerForDelegate(func);
        }
@@ -200,7 +200,7 @@ namespace ARMeilleure.Translation
        /// <returns>Generated <see cref="SlowDispatchStub"/></returns>
        private nint GenerateSlowDispatchStub()
        {
-            EmitterContext context = new();
+            var context = new EmitterContext();

            // Load the target guest address from the native context.
            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
@@ -210,11 +210,11 @@ namespace ARMeilleure.Translation
            Operand hostAddress = context.Call(typeof(NativeInterface).GetMethod(nameof(NativeInterface.GetFunctionAddress)), guestAddress);
            context.Tailcall(hostAddress, nativeContext);

-            ControlFlowGraph cfg = context.GetControlFlowGraph();
-            OperandType retType = OperandType.I64;
-            OperandType[] argTypes = new[] { OperandType.I64 };
+            var cfg = context.GetControlFlowGraph();
+            var retType = OperandType.I64;
+            var argTypes = new[] { OperandType.I64 };

-            GuestFunction func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();

            return Marshal.GetFunctionPointerForDelegate(func);
        }
@@ -251,7 +251,7 @@ namespace ARMeilleure.Translation
        /// <returns><see cref="DispatchLoop"/> function</returns>
        private DispatcherFunction GenerateDispatchLoop()
        {
-            EmitterContext context = new();
+            var context = new EmitterContext();

            Operand beginLbl = Label();
            Operand endLbl = Label();
@@ -279,9 +279,9 @@ namespace ARMeilleure.Translation

            context.Return();

-            ControlFlowGraph cfg = context.GetControlFlowGraph();
-            OperandType retType = OperandType.None;
-            OperandType[] argTypes = new[] { OperandType.I64, OperandType.I64 };
+            var cfg = context.GetControlFlowGraph();
+            var retType = OperandType.None;
+            var argTypes = new[] { OperandType.I64, OperandType.I64 };

            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<DispatcherFunction>();
        }
@@ -292,7 +292,7 @@ namespace ARMeilleure.Translation
        /// <returns><see cref="ContextWrapper"/> function</returns>
        private WrapperFunction GenerateContextWrapper()
        {
-            EmitterContext context = new();
+            var context = new EmitterContext();

            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
            Operand guestMethod = context.LoadArgument(OperandType.I64, 1);
@@ -303,9 +303,9 @@ namespace ARMeilleure.Translation

            context.Return(returnValue);

-            ControlFlowGraph cfg = context.GetControlFlowGraph();
-            OperandType retType = OperandType.I64;
-            OperandType[] argTypes = new[] { OperandType.I64, OperandType.I64 };
+            var cfg = context.GetControlFlowGraph();
+            var retType = OperandType.I64;
+            var argTypes = new[] { OperandType.I64, OperandType.I64 };

            return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>();
        }
--- a/src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceDriver.cs
+++ b/src/Ryujinx.Audio.Backends.SDL2/SDL2HardwareDeviceDriver.cs
@@ -37,7 +37,7 @@ namespace Ryujinx.Audio.Backends.SDL2

            SDL2Driver.Instance.Initialize();

-            int res = SDL_GetDefaultAudioInfo(nint.Zero, out SDL_AudioSpec spec, 0);
+            int res = SDL_GetDefaultAudioInfo(nint.Zero, out var spec, 0);

            if (res != 0)
            {
--- a/src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoOutStreamContext.cs
+++ b/src/Ryujinx.Audio.Backends.SoundIo/Native/SoundIoOutStreamContext.cs
@@ -38,7 +38,7 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
            get => Marshal.PtrToStringAnsi(GetOutContext().Name);
            set
            {
-                SoundIoOutStream context = GetOutContext();
+                var context = GetOutContext();

                if (_nameStored != nint.Zero && context.Name == _nameStored)
                {
@@ -129,8 +129,8 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native

            unsafe
            {
-                int* frameCountPtr = &nativeFrameCount;
-                IntPtr* arenasPtr = &arenas;
+                var frameCountPtr = &nativeFrameCount;
+                var arenasPtr = &arenas;
                CheckError(soundio_outstream_begin_write(_context, (nint)arenasPtr, (nint)frameCountPtr));

                frameCount = *frameCountPtr;
--- a/src/Ryujinx.Audio/Renderer/Server/AudioRenderSystem.cs
+++ b/src/Ryujinx.Audio/Renderer/Server/AudioRenderSystem.cs
@@ -436,7 +436,7 @@ namespace Ryujinx.Audio.Renderer.Server
                    return result;
                }

-                PoolMapper poolMapper = new(_processHandle, _memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());
+                PoolMapper poolMapper = new PoolMapper(_processHandle, _memoryPools, _behaviourContext.IsMemoryPoolForceMappingEnabled());

                result = stateUpdater.UpdateVoices(_voiceContext, poolMapper);

--- a/src/Ryujinx.Audio/Renderer/Utils/FileHardwareDevice.cs
+++ b/src/Ryujinx.Audio/Renderer/Utils/FileHardwareDevice.cs
@@ -27,7 +27,7 @@ namespace Ryujinx.Audio.Renderer.Utils

        private void UpdateHeader()
        {
-            BinaryWriter writer = new(_stream);
+            var writer = new BinaryWriter(_stream);

            long currentPos = writer.Seek(0, SeekOrigin.Current);

--- a/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
+++ b/src/Ryujinx.BuildValidationTasks/LocalesValidationTask.cs
@@ -83,7 +83,7 @@ namespace Ryujinx.BuildValidationTasks
            if (isGitRunner && encounteredIssue)
                throw new JsonException("1 or more locales are invalid!");

-            JsonSerializerOptions jsonOptions = new()
+            JsonSerializerOptions jsonOptions = new JsonSerializerOptions()
            {
                WriteIndented = true,
                NewLine = "\n",
--- a/src/Ryujinx.Common/AsyncWorkQueue.cs
+++ b/src/Ryujinx.Common/AsyncWorkQueue.cs
@@ -34,7 +34,7 @@ namespace Ryujinx.Common
        {
            try
            {
-                foreach (T item in _queue.GetConsumingEnumerable(_cts.Token))
+                foreach (var item in _queue.GetConsumingEnumerable(_cts.Token))
                {
                    _workerAction(item);
                }
--- a/src/Ryujinx.Common/Configuration/DirtyHack.cs
+++ b/src/Ryujinx.Common/Configuration/DirtyHack.cs
@@ -23,9 +23,8 @@ namespace Ryujinx.Common.Configuration

        public static EnabledDirtyHack Unpack(ulong packedHack)
        {
-            uint[] unpackedFields = packedHack.UnpackBitFields(PackedFormat);
-            // ReSharper disable once PatternAlwaysMatches
-            if (unpackedFields is not [uint hack, uint value])
+            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
+            if (unpackedFields is not [var hack, var value])
                throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
            
            return new EnabledDirtyHack((DirtyHack)hack, (int)value);
@@ -54,7 +53,7 @@ namespace Ryujinx.Common.Configuration
        public static implicit operator DirtyHacks(EnabledDirtyHack[] hacks) => new(hacks);
        public static implicit operator DirtyHacks(ulong[] packedHacks) => new(packedHacks);

-        public new int this[DirtyHack hack] => TryGetValue(hack, out int value) ? value : -1;
+        public new int this[DirtyHack hack] => TryGetValue(hack, out var value) ? value : -1;

        public bool IsEnabled(DirtyHack hack) => ContainsKey(hack);
    }
--- a/src/Ryujinx.Common/Extensions/SequenceReaderExtensions.cs
+++ b/src/Ryujinx.Common/Extensions/SequenceReaderExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Buffers;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

@@ -17,15 +16,15 @@ namespace Ryujinx.Common.Extensions
        /// <param name="fileFullName">The path and name of the file to create and dump to</param>
        public static void DumpToFile(this ref SequenceReader<byte> reader, string fileFullName)
        {
-            long initialConsumed = reader.Consumed;
+            var initialConsumed = reader.Consumed;

            reader.Rewind(initialConsumed);

-            using (FileStream fileStream = System.IO.File.Create(fileFullName, 4096, System.IO.FileOptions.None))
+            using (var fileStream = System.IO.File.Create(fileFullName, 4096, System.IO.FileOptions.None))
            {
                while (reader.End == false)
                {
-                    ReadOnlySpan<byte> span = reader.CurrentSpan;
+                    var span = reader.CurrentSpan;
                    fileStream.Write(span);
                    reader.Advance(span.Length);
                }
@@ -164,7 +163,7 @@ namespace Ryujinx.Common.Extensions
            // Not enough data in the current segment, try to peek for the data we need.
            T buffer = default;

-            Span<byte> tempSpan = new(&buffer, sizeof(T));
+            Span<byte> tempSpan = new Span<byte>(&buffer, sizeof(T));

            if (!reader.TryCopyTo(tempSpan))
            {
--- a/src/Ryujinx.Common/GraphicsDriver/DriverUtilities.cs
+++ b/src/Ryujinx.Common/GraphicsDriver/DriverUtilities.cs
@@ -1,33 +1,13 @@
-using Ryujinx.Common.Utilities;
 using System;

 namespace Ryujinx.Common.GraphicsDriver
 {
    public static class DriverUtilities
    {
-        private static void AddMesaFlags(string envVar, string newFlags)
-        {
-            string existingFlags = Environment.GetEnvironmentVariable(envVar);
-
-            string flags = existingFlags == null ? newFlags : $"{existingFlags},{newFlags}";
-
-            OsUtils.SetEnvironmentVariableNoCaching(envVar, flags);
-        }
-
-        public static void InitDriverConfig(bool oglThreading)
-        {
-            if (OperatingSystem.IsLinux())
-            {
-                AddMesaFlags("RADV_DEBUG", "nodcc");
-            }
-
-            ToggleOGLThreading(oglThreading);
-        }
-
        public static void ToggleOGLThreading(bool enabled)
        {
-            OsUtils.SetEnvironmentVariableNoCaching("mesa_glthread", enabled.ToString().ToLower());
-            OsUtils.SetEnvironmentVariableNoCaching("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");
+            Environment.SetEnvironmentVariable("mesa_glthread", enabled.ToString().ToLower());
+            Environment.SetEnvironmentVariable("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");

            try
            {
--- a/src/Ryujinx.Common/Helpers/FileAssociationHelper.cs
+++ b/src/Ryujinx.Common/Helpers/FileAssociationHelper.cs
@@ -101,7 +101,7 @@ namespace Ryujinx.Common.Helper
            {
                RegistryKey key = Registry.CurrentUser.OpenSubKey(@$"Software\Classes\{ext}");

-                RegistryKey openCmd = key?.OpenSubKey(@"shell\open\command");
+                var openCmd = key?.OpenSubKey(@"shell\open\command");
                
                if (openCmd is null)
                {
@@ -143,7 +143,7 @@ namespace Ryujinx.Common.Helper
                }
                else
                {
-                    using RegistryKey key = Registry.CurrentUser.CreateSubKey(keyString);
+                    using var key = Registry.CurrentUser.CreateSubKey(keyString);

                    if (key is null)
                    {
@@ -151,7 +151,7 @@ namespace Ryujinx.Common.Helper
                    }

                    Logger.Debug?.Print(LogClass.Application, $"Adding type association {ext}");
-                    using RegistryKey openCmd = key.CreateSubKey(@"shell\open\command");
+                    using var openCmd = key.CreateSubKey(@"shell\open\command");
                    openCmd.SetValue(string.Empty, $"\"{Environment.ProcessPath}\" \"%1\"");
                    Logger.Debug?.Print(LogClass.Application, $"Added type association {ext}");

--- a/src/Ryujinx.Common/Helpers/LinuxHelper.cs
+++ b/src/Ryujinx.Common/Helpers/LinuxHelper.cs
@@ -24,7 +24,7 @@ namespace Ryujinx.Common.Helper
                return null;
            }

-            foreach (string searchPath in pathVar.Split(":", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
+            foreach (var searchPath in pathVar.Split(":", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
            {
                string binaryPath = Path.Combine(searchPath, binary);

--- a/src/Ryujinx.Common/Helpers/OpenHelper.cs
+++ b/src/Ryujinx.Common/Helpers/OpenHelper.cs
@@ -60,7 +60,7 @@ namespace Ryujinx.Common.Helper
                {
                    ObjectiveC.NSString nsStringPath = new(path);
                    ObjectiveC.Object nsUrl = new("NSURL");
-                    ObjectiveC.Object urlPtr = nsUrl.GetFromMessage("fileURLWithPath:", nsStringPath);
+                    var urlPtr = nsUrl.GetFromMessage("fileURLWithPath:", nsStringPath);

                    ObjectiveC.Object nsArray = new("NSArray");
                    ObjectiveC.Object urlArray = nsArray.GetFromMessage("arrayWithObject:", urlPtr);
@@ -99,7 +99,7 @@ namespace Ryujinx.Common.Helper
            {
                ObjectiveC.NSString nsStringPath = new(url);
                ObjectiveC.Object nsUrl = new("NSURL");
-                ObjectiveC.Object urlPtr = nsUrl.GetFromMessage("URLWithString:", nsStringPath);
+                var urlPtr = nsUrl.GetFromMessage("URLWithString:", nsStringPath);

                ObjectiveC.Object nsWorkspace = new("NSWorkspace");
                ObjectiveC.Object sharedWorkspace = nsWorkspace.GetFromMessage("sharedWorkspace");
--- a/src/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs
+++ b/src/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs
@@ -41,7 +41,7 @@ namespace Ryujinx.Common.Logging.Formatters

            sb.Append('{');

-            foreach (PropertyInfo prop in props)
+            foreach (var prop in props)
            {
                sb.Append(prop.Name);
                sb.Append(": ");
@@ -52,7 +52,7 @@ namespace Ryujinx.Common.Logging.Formatters

                    if (array is not null)
                    {
-                        foreach (object? item in array)
+                        foreach (var item in array)
                        {
                            sb.Append(item);
                            sb.Append(", ");
--- a/src/Ryujinx.Common/Logging/Logger.cs
+++ b/src/Ryujinx.Common/Logging/Logger.cs
@@ -193,7 +193,7 @@ namespace Ryujinx.Common.Logging

            _stdErrAdapter.Dispose();

-            foreach (ILogTarget target in _logTargets)
+            foreach (var target in _logTargets)
            {
                target.Dispose();
            }
@@ -203,9 +203,9 @@ namespace Ryujinx.Common.Logging

        public static IReadOnlyCollection<LogLevel> GetEnabledLevels()
        {
-            Log?[] logs = new[] { Debug, Info, Warning, Error, Guest, AccessLog, Stub, Trace };
+            var logs = new[] { Debug, Info, Warning, Error, Guest, AccessLog, Stub, Trace };
            List<LogLevel> levels = new(logs.Length);
-            foreach (Log? log in logs)
+            foreach (var log in logs)
            {
                if (log.HasValue)
                    levels.Add(log.Value.Level);
--- a/src/Ryujinx.Common/Logging/Targets/JsonLogTarget.cs
+++ b/src/Ryujinx.Common/Logging/Targets/JsonLogTarget.cs
@@ -26,7 +26,7 @@ namespace Ryujinx.Common.Logging.Targets

        public void Log(object sender, LogEventArgs e)
        {
-            LogEventArgsJson logEventArgsJson = LogEventArgsJson.FromLogEventArgs(e);
+            var logEventArgsJson = LogEventArgsJson.FromLogEventArgs(e);
            JsonHelper.SerializeToStream(_stream, logEventArgsJson, LogEventJsonSerializerContext.Default.LogEventArgsJson);
        }

--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -105,7 +105,6 @@ namespace Ryujinx.Common
            "0100b04011742000", // Monster Hunter Rise 
                          
                          //Mario Franchise
-            "010021d00812a000", // Arcade Archives VS. SUPER MARIO BROS.
            "01006d0017f7a000", // Mario & Luigi: Brothership
            "010003000e146000", // Mario & Sonic at the Olympic Games Tokyo 2020
            "010067300059a000", // Mario + Rabbids: Kingdom Battle
@@ -213,41 +212,32 @@ namespace Ryujinx.Common
                          //Misc Games
            "010056e00853a000", // A Hat in Time
            "0100fd1014726000", // Baldurs Gate: Dark Alliance
-            "0100c6800b934000", // Brawlhalla
            "0100dbf01000a000", // Burnout Paradise Remastered
            "0100744001588000", // Cars 3: Driven to Win
            "0100b41013c82000", // Cruis'n Blast
            "010085900337e000", // Death Squared
            "01001b300b9be000", // Diablo III: Eternal Collection
-            "010027400cdc6000", // Divinity Original 2 - Definitive Edition
            "01008c8012920000", // Dying Light Platinum Edition
            "01001cc01b2d4000", // Goat Simulator 3
            "01003620068ea000", // Hand of Fate 2
            "010085500130a000", // Lego City: Undercover
            "010073c01af34000", // LEGO Horizon Adventures
-            "0100d71004694000", // Minecraft
-            "01007430037f6000", // Monopoly
            "0100853015e86000", // No Man's Sky
            "01007bb017812000", // Portal
            "0100abd01785c000", // Portal 2
            "01008e200c5c2000", // Muse Dash
            "01007820196a6000", // Red Dead Redemption
-            "0100e8300a67a000", // Risk
            "01002f7013224000", // Rune Factory 5
            "01008d100d43e000", // Saints Row IV
            "0100de600beee000", // Saints Row: The Third - The Full Package
            "01001180021fa000", // Shovel Knight: Specter of Torment
-            "0100e65002bb8000", // Stardew Valley
            "0100d7a01b7a2000", // Star Wars: Bounty Hunter
            "0100800015926000", // Suika Game
-            "01007ad00013e000", // Super Bomberman R
            "0100e46006708000", // Terraria
-            "0100605008268000", // Titan Quest
            "01000a10041ea000", // The Elder Scrolls V: Skyrim
            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
            "010080b00ad66000", // Undertale
            "010069401adb8000", // Unicorn Overlord
-            "01005c600ac68000", // Valkyria Chronicles 4
            "0100534009ff2000", // Yonder - The cloud catcher chronicles
        ];
    }
--- a/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
+++ b/src/Ryujinx.Common/Utilities/EmbeddedResources.cs
@@ -19,21 +19,21 @@ namespace Ryujinx.Common

        public static byte[] Read(string filename)
        {
-            (Assembly assembly, string path) = ResolveManifestPath(filename);
+            var (assembly, path) = ResolveManifestPath(filename);

            return Read(assembly, path);
        }

        public static Task<byte[]> ReadAsync(string filename)
        {
-            (Assembly assembly, string path) = ResolveManifestPath(filename);
+            var (assembly, path) = ResolveManifestPath(filename);

            return ReadAsync(assembly, path);
        }

        public static byte[] Read(Assembly assembly, string filename)
        {
-            using Stream stream = GetStream(assembly, filename);
+            using var stream = GetStream(assembly, filename);
            if (stream == null)
            {
                return null;
@@ -44,14 +44,14 @@ namespace Ryujinx.Common

        public static MemoryOwner<byte> ReadFileToRentedMemory(string filename)
        {
-            (Assembly assembly, string path) = ResolveManifestPath(filename);
+            var (assembly, path) = ResolveManifestPath(filename);

            return ReadFileToRentedMemory(assembly, path);
        }

        public static MemoryOwner<byte> ReadFileToRentedMemory(Assembly assembly, string filename)
        {
-            using Stream stream = GetStream(assembly, filename);
+            using var stream = GetStream(assembly, filename);

            return stream is null
                ? null
@@ -60,7 +60,7 @@ namespace Ryujinx.Common

        public async static Task<byte[]> ReadAsync(Assembly assembly, string filename)
        {
-            using Stream stream = GetStream(assembly, filename);
+            using var stream = GetStream(assembly, filename);
            if (stream == null)
            {
                return null;
@@ -71,55 +71,55 @@ namespace Ryujinx.Common

        public static string ReadAllText(string filename)
        {
-            (Assembly assembly, string path) = ResolveManifestPath(filename);
+            var (assembly, path) = ResolveManifestPath(filename);

            return ReadAllText(assembly, path);
        }

        public static Task<string> ReadAllTextAsync(string filename)
        {
-            (Assembly assembly, string path) = ResolveManifestPath(filename);
+            var (assembly, path) = ResolveManifestPath(filename);

            return ReadAllTextAsync(assembly, path);
        }

        public static string ReadAllText(Assembly assembly, string filename)
        {
-            using Stream stream = GetStream(assembly, filename);
+            using var stream = GetStream(assembly, filename);
            if (stream == null)
            {
                return null;
            }

-            using StreamReader reader = new(stream);
+            using var reader = new StreamReader(stream);
            return reader.ReadToEnd();
        }

        public async static Task<string> ReadAllTextAsync(Assembly assembly, string filename)
        {
-            using Stream stream = GetStream(assembly, filename);
+            using var stream = GetStream(assembly, filename);
            if (stream == null)
            {
                return null;
            }

-            using StreamReader reader = new(stream);
+            using var reader = new StreamReader(stream);
            return await reader.ReadToEndAsync();
        }

        public static Stream GetStream(string filename)
        {
-            (Assembly assembly, string path) = ResolveManifestPath(filename);
+            var (assembly, path) = ResolveManifestPath(filename);

            return GetStream(assembly, path);
        }

        public static Stream GetStream(Assembly assembly, string filename)
        {
-            string @namespace = assembly.GetName().Name;
-            string manifestUri = @namespace + "." + filename.Replace('/', '.');
+            var @namespace = assembly.GetName().Name;
+            var manifestUri = @namespace + "." + filename.Replace('/', '.');

-            Stream stream = assembly.GetManifestResourceStream(manifestUri);
+            var stream = assembly.GetManifestResourceStream(manifestUri);

            return stream;
        }
@@ -133,11 +133,11 @@ namespace Ryujinx.Common

        private static (Assembly, string) ResolveManifestPath(string filename)
        {
-            string[] segments = filename.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);
+            var segments = filename.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);

            if (segments.Length >= 2)
            {
-                foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+                foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
                {
                    if (assembly.GetName().Name == segments[0])
                    {
--- a/src/Ryujinx.Common/Utilities/FileSystemUtils.cs
+++ b/src/Ryujinx.Common/Utilities/FileSystemUtils.cs
@@ -9,7 +9,7 @@ namespace Ryujinx.Common.Utilities
        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive)
        {
            // Get information about the source directory
-            DirectoryInfo dir = new(sourceDir);
+            var dir = new DirectoryInfo(sourceDir);

            // Check if the source directory exists
            if (!dir.Exists)
@@ -49,7 +49,7 @@ namespace Ryujinx.Common.Utilities

        public static string SanitizeFileName(string fileName)
        {
-            HashSet<char> reservedChars = new(Path.GetInvalidFileNameChars());
+            var reservedChars = new HashSet<char>(Path.GetInvalidFileNameChars());
            return string.Concat(fileName.Select(c => reservedChars.Contains(c) ? '_' : c));
        }
    }
--- a/src/Ryujinx.Common/Utilities/MessagePackObjectFormatter.cs
+++ b/src/Ryujinx.Common/Utilities/MessagePackObjectFormatter.cs
@@ -1,6 +1,5 @@
 using MsgPack;
 using System;
-using System.Collections.Generic;
 using System.Text;

 namespace Ryujinx.Common.Utilities
@@ -19,7 +18,7 @@ namespace Ryujinx.Common.Utilities

        public static string Format(MessagePackObject obj)
        {
-            IndentedStringBuilder builder = new();
+            var builder = new IndentedStringBuilder();

            FormatMsgPackObj(obj, builder);

@@ -42,7 +41,7 @@ namespace Ryujinx.Common.Utilities
            }
            else
            {
-                object literal = obj.ToObject();
+                var literal = obj.ToObject();

                if (literal is String)
                {
@@ -89,7 +88,7 @@ namespace Ryujinx.Common.Utilities
        {
            builder.Append("[ ");

-            foreach (byte b in arr)
+            foreach (var b in arr)
            {
                builder.Append("0x");
                builder.Append(ToHexChar(b >> 4));
@@ -112,7 +111,7 @@ namespace Ryujinx.Common.Utilities
                builder.Append("0x");
            }

-            foreach (byte b in arr)
+            foreach (var b in arr)
            {
                builder.Append(ToHexChar(b >> 4));
                builder.Append(ToHexChar(b & 0xF));
@@ -123,7 +122,7 @@ namespace Ryujinx.Common.Utilities

        private static void FormatMsgPackMap(MessagePackObject obj, IndentedStringBuilder builder)
        {
-            MessagePackObjectDictionary map = obj.AsDictionary();
+            var map = obj.AsDictionary();

            builder.Append('{');

@@ -131,7 +130,7 @@ namespace Ryujinx.Common.Utilities
            builder.IncreaseIndent()
                   .AppendLine();

-            foreach (KeyValuePair<MessagePackObject, MessagePackObject> item in map)
+            foreach (var item in map)
            {
                FormatMsgPackObj(item.Key, builder);

@@ -155,11 +154,11 @@ namespace Ryujinx.Common.Utilities

        private static void FormatMsgPackArray(MessagePackObject obj, IndentedStringBuilder builder)
        {
-            IList<MessagePackObject> arr = obj.AsList();
+            var arr = obj.AsList();

            builder.Append("[ ");

-            foreach (MessagePackObject item in arr)
+            foreach (var item in arr)
            {
                FormatMsgPackObj(item, builder);

--- a/src/Ryujinx.Common/Utilities/OsUtils.cs
+++ b/src/Ryujinx.Common/Utilities/OsUtils.cs
@@ -1,24 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Common.Utilities
-{
-    public partial class OsUtils
-    {
-        [LibraryImport("libc", SetLastError = true)]
-        private static partial int setenv([MarshalAs(UnmanagedType.LPStr)] string name, [MarshalAs(UnmanagedType.LPStr)] string value, int overwrite);
-
-        public static void SetEnvironmentVariableNoCaching(string key, string value)
-        {
-            // Set the value in the cached environment variables, too.
-            Environment.SetEnvironmentVariable(key, value);
-
-            if (!OperatingSystem.IsWindows())
-            {
-                int res = setenv(key, value, 1);
-                Debug.Assert(res != -1);
-            }
-        }
-    }
-}
--- a/src/Ryujinx.Common/Utilities/Rainbow.cs
+++ b/src/Ryujinx.Common/Utilities/Rainbow.cs
@@ -1,7 +1,6 @@
 using Gommon;
 using System;
 using System.Drawing;
-using System.Threading;
 using System.Threading.Tasks;

 namespace Ryujinx.Common.Utilities
@@ -19,7 +18,7 @@ namespace Ryujinx.Common.Utilities
                {
                    while (CyclingEnabled)
                    {
-                        await Task.Delay(20);
+                        await Task.Delay(15);
                        Tick();
                    }
                });
@@ -33,47 +32,29 @@ namespace Ryujinx.Common.Utilities
        
        
        public static float Speed { get; set; } = 1;
-
-        private static readonly Lock _lock = new();
        
-        private static Color _color = Color.Blue;
-
-        public static ref Color Color
-        {
-            get
-            {
-                lock (_lock)
-                {
-                    return ref _color;
-                }
-            }
-        }
+        public static Color Color { get; private set; } = Color.Blue;

        public static void Tick()
        {
-            lock (_lock)
-            {
-                _color = HsbToRgb((_color.GetHue() + Speed) / 360);
+            Color = HsbToRgb((Color.GetHue() + Speed) / 360);
            
-                _updatedHandler.Call(_color.ToArgb());
-            }
+            UpdatedHandler.Call(Color.ToArgb());
        }

        public static void Reset()
        {
-            _updatedHandler.Clear();
-            
-            lock (_lock)
-                _color = Color.Blue;
+            Color = Color.Blue;
+            UpdatedHandler.Clear();
        }

        public static event Action<int> Updated
        {
-            add => _updatedHandler.Add(value);
-            remove => _updatedHandler.Remove(value);
+            add => UpdatedHandler.Add(value);
+            remove => UpdatedHandler.Remove(value);
        }

-        private static readonly Event<int> _updatedHandler = new();
+        internal static Event<int> UpdatedHandler = new();

        private static Color HsbToRgb(float hue, float saturation = 1, float brightness = 1)
        {
--- a/src/Ryujinx.Common/Utilities/StreamUtils.cs
+++ b/src/Ryujinx.Common/Utilities/StreamUtils.cs
@@ -1,6 +1,5 @@
 using Microsoft.IO;
 using Ryujinx.Common.Memory;
-using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -28,7 +27,7 @@ namespace Ryujinx.Common.Utilities

                MemoryOwner<byte> ownedMemory = MemoryOwner<byte>.Rent(checked((int)bytesExpected));

-                Span<byte> destSpan = ownedMemory.Span;
+                var destSpan = ownedMemory.Span;

                int totalBytesRead = 0;

--- a/src/Ryujinx.Common/Utilities/TypedStringEnumConverter.cs
+++ b/src/Ryujinx.Common/Utilities/TypedStringEnumConverter.cs
@@ -18,7 +18,7 @@ namespace Ryujinx.Common.Utilities
    {
        public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
        {
-            string? enumValue = reader.GetString();
+            var enumValue = reader.GetString();

            if (Enum.TryParse(enumValue, out TEnum value))
            {
--- a/src/Ryujinx.Common/Utilities/XCIFileTrimmer.cs
+++ b/src/Ryujinx.Common/Utilities/XCIFileTrimmer.cs
@@ -46,7 +46,7 @@ namespace Ryujinx.Common.Utilities
        {
            if (Path.GetExtension(filename).Equals(".XCI", StringComparison.InvariantCultureIgnoreCase))
            {
-                XCIFileTrimmer trimmer = new(filename, log);
+                var trimmer = new XCIFileTrimmer(filename, log);
                return trimmer.CanBeTrimmed;
            }

@@ -57,7 +57,7 @@ namespace Ryujinx.Common.Utilities
        {
            if (Path.GetExtension(filename).Equals(".XCI", StringComparison.InvariantCultureIgnoreCase))
            {
-                XCIFileTrimmer trimmer = new(filename, log);
+                var trimmer = new XCIFileTrimmer(filename, log);
                return trimmer.CanBeUntrimmed;
            }

@@ -201,7 +201,7 @@ namespace Ryujinx.Common.Utilities
        {
            long maxReads = readSizeB / XCIFileTrimmer.BufferSize;
            long read = 0;
-            byte[] buffer = new byte[BufferSize];
+            var buffer = new byte[BufferSize];

            while (true)
            {
@@ -267,7 +267,7 @@ namespace Ryujinx.Common.Utilities

            try
            {
-                FileInfo info = new(Filename);
+                var info = new FileInfo(Filename);
                if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
                {
                    try
@@ -288,7 +288,7 @@ namespace Ryujinx.Common.Utilities
                    return OperationOutcome.FileSizeChanged;
                }

-                FileStream outfileStream = new(_filename, FileMode.Open, FileAccess.Write, FileShare.Write);
+                var outfileStream = new FileStream(_filename, FileMode.Open, FileAccess.Write, FileShare.Write);

                try
                {
@@ -327,7 +327,7 @@ namespace Ryujinx.Common.Utilities
            {
                Log?.Write(LogType.Info, "Untrimming...");

-                FileInfo info = new(Filename);
+                var info = new FileInfo(Filename);
                if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
                {
                    try
@@ -348,7 +348,7 @@ namespace Ryujinx.Common.Utilities
                    return OperationOutcome.FileSizeChanged;
                }

-                FileStream outfileStream = new(_filename, FileMode.Append, FileAccess.Write, FileShare.Write);
+                var outfileStream = new FileStream(_filename, FileMode.Append, FileAccess.Write, FileShare.Write);
                long bytesToWriteB = UntrimmedFileSizeB - FileSizeB;

                try
@@ -393,7 +393,7 @@ namespace Ryujinx.Common.Utilities

            try
            {
-                byte[] buffer = new byte[BufferSize];
+                var buffer = new byte[BufferSize];
                Array.Fill<byte>(buffer, XCIFileTrimmer.PaddingByte);

                while (bytesLeftToWriteB > 0)
--- a/src/Ryujinx.Cpu/AddressTable.cs
+++ b/src/Ryujinx.Cpu/AddressTable.cs
@@ -49,7 +49,7 @@ namespace ARMeilleure.Common

            public TableSparseBlock(ulong size, Action<IntPtr> ensureMapped, PageInitDelegate pageInit)
            {
-                SparseMemoryBlock block = new(size, pageInit, null);
+                var block = new SparseMemoryBlock(size, pageInit, null);

                _trackingEvent = (ulong address, ulong size, bool write) =>
                {
@@ -146,7 +146,7 @@ namespace ARMeilleure.Common
            Levels = levels;
            Mask = 0;

-            foreach (AddressTableLevel level in Levels)
+            foreach (var level in Levels)
            {
                Mask |= level.Mask;
            }
@@ -363,7 +363,7 @@ namespace ARMeilleure.Common
        /// <returns>The new sparse block that was added</returns>
        private TableSparseBlock ReserveNewSparseBlock()
        {
-            TableSparseBlock block = new(_sparseBlockSize, EnsureMapped, InitLeafPage);
+            var block = new TableSparseBlock(_sparseBlockSize, EnsureMapped, InitLeafPage);

            _sparseReserved.Add(block);
            _sparseReservedOffset = 0;
@@ -381,7 +381,7 @@ namespace ARMeilleure.Common
        /// <returns>Allocated block</returns>
        private IntPtr Allocate<T>(int length, T fill, bool leaf) where T : unmanaged
        {
-            int size = sizeof(T) * length;
+            var size = sizeof(T) * length;

            AddressTablePage page;

@@ -413,10 +413,10 @@ namespace ARMeilleure.Common
            }
            else
            {
-                IntPtr address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
+                var address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
                page = new AddressTablePage(false, address);

-                Span<T> span = new((void*)page.Address, length);
+                var span = new Span<T>((void*)page.Address, length);
                span.Fill(fill);
            }

@@ -445,7 +445,7 @@ namespace ARMeilleure.Common
        {
            if (!_disposed)
            {
-                foreach (AddressTablePage page in _pages)
+                foreach (var page in _pages)
                {
                    if (!page.IsSparse)
                    {
--- a/src/Ryujinx.Cpu/AppleHv/HvAddressSpace.cs
+++ b/src/Ryujinx.Cpu/AppleHv/HvAddressSpace.cs
@@ -29,7 +29,7 @@ namespace Ryujinx.Cpu.AppleHv

        public HvAddressSpace(MemoryBlock backingMemory, ulong asSize)
        {
-            (_asBase, HvIpaAllocator ipaAllocator) = HvVm.CreateAddressSpace(backingMemory);
+            (_asBase, var ipaAllocator) = HvVm.CreateAddressSpace(backingMemory);
            _backingSize = backingMemory.Size;

            _userRange = new HvAddressSpaceRange(ipaAllocator);
--- a/src/Ryujinx.Cpu/AppleHv/HvMemoryBlockAllocator.cs
+++ b/src/Ryujinx.Cpu/AppleHv/HvMemoryBlockAllocator.cs
@@ -45,7 +45,7 @@ namespace Ryujinx.Cpu.AppleHv

        public HvMemoryBlockAllocation Allocate(ulong size, ulong alignment)
        {
-            Allocation allocation = Allocate(size, alignment, CreateBlock);
+            var allocation = Allocate(size, alignment, CreateBlock);

            return new HvMemoryBlockAllocation(this, allocation.Block, allocation.Offset, allocation.Size);
        }
--- a/src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs
+++ b/src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs
@@ -233,13 +233,13 @@ namespace Ryujinx.Cpu.AppleHv
                yield break;
            }

-            IEnumerable<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
+            var guestRegions = GetPhysicalRegionsImpl(va, size);
            if (guestRegions == null)
            {
                yield break;
            }

-            foreach (MemoryRange guestRegion in guestRegions)
+            foreach (var guestRegion in guestRegions)
            {
                nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
@@ -254,7 +254,7 @@ namespace Ryujinx.Cpu.AppleHv
                yield break;
            }

-            foreach (MemoryRange physicalRegion in GetPhysicalRegionsImpl(va, size))
+            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
            {
                yield return physicalRegion;
            }
--- a/src/Ryujinx.Cpu/AppleHv/HvVcpu.cs
+++ b/src/Ryujinx.Cpu/AppleHv/HvVcpu.cs
@@ -41,7 +41,7 @@ namespace Ryujinx.Cpu.AppleHv
            {
                // Calculate our time delta in ticks based on the current clock frequency.

-                int result = TimeApi.mach_timebase_info(out MachTimebaseInfo timeBaseInfo);
+                int result = TimeApi.mach_timebase_info(out var timeBaseInfo);

                Debug.Assert(result == 0);

--- a/src/Ryujinx.Cpu/AppleHv/HvVm.cs
+++ b/src/Ryujinx.Cpu/AppleHv/HvVm.cs
@@ -39,7 +39,7 @@ namespace Ryujinx.Cpu.AppleHv
                baseAddress = ipaAllocator.Allocate(block.Size, AsIpaAlignment);
            }

-            HvMemoryFlags rwx = HvMemoryFlags.Read | HvMemoryFlags.Write | HvMemoryFlags.Exec;
+            var rwx = HvMemoryFlags.Read | HvMemoryFlags.Write | HvMemoryFlags.Exec;

            HvApi.hv_vm_map((ulong)block.Pointer, baseAddress, block.Size, rwx).ThrowOnError();

--- a/src/Ryujinx.Cpu/Jit/HostTracked/AddressSpacePartition.cs
+++ b/src/Ryujinx.Cpu/Jit/HostTracked/AddressSpacePartition.cs
@@ -127,7 +127,7 @@ namespace Ryujinx.Cpu.Jit.HostTracked
                Debug.Assert(leftSize > 0);
                Debug.Assert(rightSize > 0);

-                (PrivateMemoryAllocation leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize);
+                (var leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize);

                PrivateMapping left = new(Address, leftSize, leftAllocation);

--- a/src/Ryujinx.Cpu/Jit/MemoryManager.cs
+++ b/src/Ryujinx.Cpu/Jit/MemoryManager.cs
@@ -253,13 +253,13 @@ namespace Ryujinx.Cpu.Jit
                yield break;
            }

-            IEnumerable<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
+            var guestRegions = GetPhysicalRegionsImpl(va, size);
            if (guestRegions == null)
            {
                yield break;
            }

-            foreach (MemoryRange guestRegion in guestRegions)
+            foreach (var guestRegion in guestRegions)
            {
                nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
@@ -274,7 +274,7 @@ namespace Ryujinx.Cpu.Jit
                yield break;
            }

-            foreach (MemoryRange physicalRegion in GetPhysicalRegionsImpl(va, size))
+            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
            {
                yield return physicalRegion;
            }
--- a/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs
+++ b/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs
@@ -340,7 +340,7 @@ namespace Ryujinx.Cpu.Jit
        {
            int pages = GetPagesCount(va, (uint)size, out va);

-            List<MemoryRange> regions = new();
+            var regions = new List<MemoryRange>();

            ulong regionStart = GetPhysicalAddressChecked(va);
            ulong regionSize = PageSize;
--- a/src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs
+++ b/src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs
@@ -240,7 +240,7 @@ namespace Ryujinx.Cpu.Jit

            if (TryGetVirtualContiguous(va, data.Length, out MemoryBlock memoryBlock, out ulong offset))
            {
-                Span<byte> target = memoryBlock.GetSpan(offset, data.Length);
+                var target = memoryBlock.GetSpan(offset, data.Length);

                bool changed = !data.SequenceEqual(target);

@@ -443,7 +443,7 @@ namespace Ryujinx.Cpu.Jit
                return null;
            }

-            List<HostMemoryRange> regions = new();
+            var regions = new List<HostMemoryRange>();
            ulong endVa = va + size;

            try
--- a/src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitFlow.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Arm32/Target/Arm64/InstEmitFlow.cs
@@ -205,7 +205,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm32.Target.Arm64

                for (int i = 0; i < funcTable.Levels.Length; i++)
                {
-                    AddressTableLevel level = funcTable.Levels[i];
+                    var level = funcTable.Levels[i];
                    asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
                    asm.Lsl(indexReg, indexReg, Const(3));

--- a/src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/InstEmitSystem.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Arm64/Target/Arm64/InstEmitSystem.cs
@@ -370,7 +370,7 @@ namespace Ryujinx.Cpu.LightningJit.Arm64.Target.Arm64

                for (int i = 0; i < funcTable.Levels.Length; i++)
                {
-                    AddressTableLevel level = funcTable.Levels[i];
+                    var level = funcTable.Levels[i];
                    asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
                    asm.Lsl(indexReg, indexReg, Const(3));

--- a/src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs
@@ -190,7 +190,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache

        private bool TryGetThreadLocalFunction(ulong guestAddress, out nint funcPtr)
        {
-            if ((_threadLocalCache ??= new()).TryGetValue(guestAddress, out ThreadLocalCacheEntry entry))
+            if ((_threadLocalCache ??= new()).TryGetValue(guestAddress, out var entry))
            {
                if (entry.IncrementUseCount() >= MinCallsForPad)
                {
--- a/src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/Assembler.cs
+++ b/src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/Assembler.cs
@@ -41,7 +41,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
        {
            int targetIndex = _code.Count;

-            LabelState state = _labels[label.AsInt32()];
+            var state = _labels[label.AsInt32()];

            state.TargetIndex = targetIndex;
            state.HasTarget = true;
@@ -68,7 +68,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
        {
            int branchIndex = _code.Count;

-            LabelState state = _labels[label.AsInt32()];
+            var state = _labels[label.AsInt32()];

            state.BranchIndex = branchIndex;
            state.HasBranch = true;
@@ -94,7 +94,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
        {
            int branchIndex = _code.Count;

-            LabelState state = _labels[label.AsInt32()];
+            var state = _labels[label.AsInt32()];

            state.BranchIndex = branchIndex;
            state.HasBranch = true;
@@ -113,7 +113,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
        {
            int branchIndex = _code.Count;

-            LabelState state = _labels[label.AsInt32()];
+            var state = _labels[label.AsInt32()];

            state.BranchIndex = branchIndex;
            state.HasBranch = true;
@@ -342,7 +342,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64

        public readonly void Cset(Operand rd, ArmCondition condition)
        {
-            Operand zr = new(ZrRegister, RegisterType.Integer, rd.Type);
+            var zr = new Operand(ZrRegister, RegisterType.Integer, rd.Type);
            Csinc(rd, zr, zr, (ArmCondition)((int)condition ^ 1));
        }

@@ -857,7 +857,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64

        public readonly void PrfmI(Operand rn, int imm, uint type, uint target, uint policy)
        {
-            Operand rt = new((int)EncodeTypeTargetPolicy(type, target, policy), RegisterType.Integer, OperandType.I32);
+            Operand rt = new Operand((int)EncodeTypeTargetPolicy(type, target, policy), RegisterType.Integer, OperandType.I32);
            WriteInstruction(0xf9800000u | (EncodeUImm12(imm, 3) << 10), rt, rn);
        }

@@ -868,7 +868,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64

        public readonly void Prfum(Operand rn, int imm, uint type, uint target, uint policy)
        {
-            Operand rt = new((int)EncodeTypeTargetPolicy(type, target, policy), RegisterType.Integer, OperandType.I32);
+            Operand rt = new Operand((int)EncodeTypeTargetPolicy(type, target, policy), RegisterType.Integer, OperandType.I32);
            WriteInstruction(0xf8800000u | (EncodeSImm9(imm) << 12), rt, rn);
        }

--- a/src/Ryujinx.Cpu/LightningJit/Translator.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Translator.cs
@@ -163,14 +163,14 @@ namespace Ryujinx.Cpu.LightningJit
        {
            List<TranslatedFunction> functions = Functions.AsList();

-            foreach (TranslatedFunction func in functions)
+            foreach (var func in functions)
            {
                JitCache.Unmap(func.FuncPointer);
            }

            Functions.Clear();

-            while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
+            while (_oldFuncs.TryDequeue(out var kv))
            {
                JitCache.Unmap(kv.Value.FuncPointer);
            }
--- a/src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs
+++ b/src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs
@@ -174,7 +174,7 @@ namespace Ryujinx.Cpu.LightningJit

                for (int i = 0; i < _functionTable.Levels.Length; i++)
                {
-                    ref AddressTableLevel level = ref _functionTable.Levels[i];
+                    ref var level = ref _functionTable.Levels[i];

                    asm.Mov(mask, level.Mask >> level.Index);
                    asm.And(index, mask, guestAddress, ArmShiftType.Lsr, level.Index);
--- a/src/Ryujinx.Cpu/PrivateMemoryAllocator.cs
+++ b/src/Ryujinx.Cpu/PrivateMemoryAllocator.cs
@@ -40,7 +40,7 @@ namespace Ryujinx.Cpu
                Size = size;
                _freeRanges = new List<Range>
                {
-                    new(0, size),
+                    new Range(0, size),
                };
            }

@@ -48,7 +48,7 @@ namespace Ryujinx.Cpu
            {
                for (int i = 0; i < _freeRanges.Count; i++)
                {
-                    Range range = _freeRanges[i];
+                    var range = _freeRanges[i];

                    ulong alignedOffset = BitUtils.AlignUp(range.Offset, alignment);
                    ulong sizeDelta = alignedOffset - range.Offset;
@@ -84,7 +84,7 @@ namespace Ryujinx.Cpu

            private void InsertFreeRange(ulong offset, ulong size)
            {
-                Range range = new(offset, size);
+                var range = new Range(offset, size);
                int index = _freeRanges.BinarySearch(range);
                if (index < 0)
                {
@@ -97,7 +97,7 @@ namespace Ryujinx.Cpu
            private void InsertFreeRangeComingled(ulong offset, ulong size)
            {
                ulong endOffset = offset + size;
-                Range range = new(offset, size);
+                var range = new Range(offset, size);
                int index = _freeRanges.BinarySearch(range);
                if (index < 0)
                {
@@ -149,7 +149,7 @@ namespace Ryujinx.Cpu

        public PrivateMemoryAllocation Allocate(ulong size, ulong alignment)
        {
-            Allocation allocation = Allocate(size, alignment, CreateBlock);
+            var allocation = Allocate(size, alignment, CreateBlock);

            return new PrivateMemoryAllocation(this, allocation.Block, allocation.Offset, allocation.Size);
        }
@@ -200,7 +200,7 @@ namespace Ryujinx.Cpu

            for (int i = 0; i < _blocks.Count; i++)
            {
-                T block = _blocks[i];
+                var block = _blocks[i];

                if (block.Size >= size)
                {
@@ -214,8 +214,8 @@ namespace Ryujinx.Cpu

            ulong blockAlignedSize = BitUtils.AlignUp(size, _blockAlignment);

-            MemoryBlock memory = new(blockAlignedSize, _allocationFlags);
-            T newBlock = createBlock(memory, blockAlignedSize);
+            var memory = new MemoryBlock(blockAlignedSize, _allocationFlags);
+            var newBlock = createBlock(memory, blockAlignedSize);

            InsertBlock(newBlock);

--- a/src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs
+++ b/src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs
@@ -98,7 +98,7 @@ namespace Ryujinx.Cpu.Signal
                        _signalHandlerPtr = customSignalHandlerFactory(UnixSignalHandlerRegistration.GetSegfaultExceptionHandler().sa_handler, _signalHandlerPtr);
                    }

-                    UnixSignalHandlerRegistration.SigAction old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);
+                    var old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);

                    config.UnixOldSigaction = (nuint)(ulong)old.sa_handler;
                    config.UnixOldSigaction3Arg = old.sa_flags & 4;
--- a/src/Ryujinx.Graphics.Device/DeviceState.cs
+++ b/src/Ryujinx.Graphics.Device/DeviceState.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

@@ -33,15 +32,15 @@ namespace Ryujinx.Graphics.Device
                _debugLogCallback = debugLogCallback;
            }

-            FieldInfo[] fields = typeof(TState).GetFields();
+            var fields = typeof(TState).GetFields();
            int offset = 0;

            for (int fieldIndex = 0; fieldIndex < fields.Length; fieldIndex++)
            {
-                FieldInfo field = fields[fieldIndex];
+                var field = fields[fieldIndex];

-                int currentFieldOffset = (int)Marshal.OffsetOf<TState>(field.Name);
-                int nextFieldOffset = fieldIndex + 1 == fields.Length ? Unsafe.SizeOf<TState>() : (int)Marshal.OffsetOf<TState>(fields[fieldIndex + 1].Name);
+                var currentFieldOffset = (int)Marshal.OffsetOf<TState>(field.Name);
+                var nextFieldOffset = fieldIndex + 1 == fields.Length ? Unsafe.SizeOf<TState>() : (int)Marshal.OffsetOf<TState>(fields[fieldIndex + 1].Name);

                int sizeOfField = nextFieldOffset - currentFieldOffset;

@@ -49,7 +48,7 @@ namespace Ryujinx.Graphics.Device
                {
                    int index = (offset + i) / RegisterSize;

-                    if (callbacks != null && callbacks.TryGetValue(field.Name, out RwCallback cb))
+                    if (callbacks != null && callbacks.TryGetValue(field.Name, out var cb))
                    {
                        if (cb.Read != null)
                        {
@@ -82,7 +81,7 @@ namespace Ryujinx.Graphics.Device
            {
                uint alignedOffset = index * RegisterSize;

-                Func<int> readCallback = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(_readCallbacks), (nint)index);
+                var readCallback = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(_readCallbacks), (nint)index);
                if (readCallback != null)
                {
                    return readCallback();
@@ -120,7 +119,7 @@ namespace Ryujinx.Graphics.Device
                uint alignedOffset = index * RegisterSize;
                DebugWrite(alignedOffset, data);

-                ref int storage = ref GetRefIntAlignedUncheck(index);
+                ref var storage = ref GetRefIntAlignedUncheck(index);
                changed = storage != data;
                storage = data;

--- a/src/Ryujinx.Graphics.GAL/ComputeSize.cs
+++ b/src/Ryujinx.Graphics.GAL/ComputeSize.cs
@@ -2,7 +2,7 @@ namespace Ryujinx.Graphics.GAL
 {
    public readonly struct ComputeSize
    {
-        public readonly static ComputeSize VtgAsCompute = new(32, 32, 1);
+        public readonly static ComputeSize VtgAsCompute = new ComputeSize(32, 32, 1);

        public readonly int X;
        public readonly int Y;
--- a/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs
@@ -359,7 +359,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading

        public bool TryHostConditionalRendering(ICounterEvent value, ulong compare, bool isEqual)
        {
-            ThreadedCounterEvent evt = value as ThreadedCounterEvent;
+            var evt = value as ThreadedCounterEvent;
            if (evt != null)
            {
                if (compare == 0 && evt.Type == CounterType.SamplesPassed && evt.ClearCounter)
--- a/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs
@@ -294,7 +294,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading

        public IImageArray CreateImageArray(int size, bool isBuffer)
        {
-            ThreadedImageArray imageArray = new(this);
+            var imageArray = new ThreadedImageArray(this);
            New<CreateImageArrayCommand>().Set(Ref(imageArray), size, isBuffer);
            QueueCommand();

@@ -303,7 +303,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading

        public IProgram CreateProgram(ShaderSource[] shaders, ShaderInfo info)
        {
-            ThreadedProgram program = new(this);
+            var program = new ThreadedProgram(this);

            SourceProgramRequest request = new(program, shaders, info);

@@ -319,7 +319,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading

        public ISampler CreateSampler(SamplerCreateInfo info)
        {
-            ThreadedSampler sampler = new(this);
+            var sampler = new ThreadedSampler(this);
            New<CreateSamplerCommand>().Set(Ref(sampler), info);
            QueueCommand();

@@ -337,7 +337,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
        {
            if (IsGpuThread())
            {
-                ThreadedTexture texture = new(this, info);
+                var texture = new ThreadedTexture(this, info);
                New<CreateTextureCommand>().Set(Ref(texture), info);
                QueueCommand();

@@ -345,7 +345,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            }
            else
            {
-                ThreadedTexture texture = new(this, info)
+                var texture = new ThreadedTexture(this, info)
                {
                    Base = _baseRenderer.CreateTexture(info),
                };
@@ -355,7 +355,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
        }
        public ITextureArray CreateTextureArray(int size, bool isBuffer)
        {
-            ThreadedTextureArray textureArray = new(this);
+            var textureArray = new ThreadedTextureArray(this);
            New<CreateTextureArrayCommand>().Set(Ref(textureArray), size, isBuffer);
            QueueCommand();

@@ -414,7 +414,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading

        public IProgram LoadProgramBinary(byte[] programBinary, bool hasFragmentShader, ShaderInfo info)
        {
-            ThreadedProgram program = new(this);
+            var program = new ThreadedProgram(this);

            BinaryProgramRequest request = new(program, programBinary, hasFragmentShader, info);
            Programs.Add(request);
--- a/src/Ryujinx.Graphics.GAL/ResourceLayout.cs
+++ b/src/Ryujinx.Graphics.GAL/ResourceLayout.cs
@@ -126,7 +126,7 @@ namespace Ryujinx.Graphics.GAL

            if (Descriptors != null)
            {
-                foreach (ResourceDescriptor descriptor in Descriptors)
+                foreach (var descriptor in Descriptors)
                {
                    hasher.Add(descriptor);
                }
--- a/src/Ryujinx.Graphics.Gpu/Engine/Compute/ComputeClass.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/Compute/ComputeClass.cs
@@ -2,7 +2,6 @@ using Ryujinx.Graphics.Device;
 using Ryujinx.Graphics.Gpu.Engine.InlineToMemory;
 using Ryujinx.Graphics.Gpu.Engine.Threed;
 using Ryujinx.Graphics.Gpu.Engine.Types;
-using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.Shader;
 using System;
@@ -91,7 +90,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
        /// <param name="argument">Method call argument</param>
        private void SendSignalingPcasB(int argument)
        {
-            MemoryManager memoryManager = _channel.MemoryManager;
+            var memoryManager = _channel.MemoryManager;

            // Since we're going to change the state, make sure any pending instanced draws are done.
            _3dEngine.PerformDeferredDraws();
@@ -101,7 +100,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute

            uint qmdAddress = _state.State.SendPcasA;

-            ComputeQmd qmd = _channel.MemoryManager.Read<ComputeQmd>((ulong)qmdAddress << 8);
+            var qmd = _channel.MemoryManager.Read<ComputeQmd>((ulong)qmdAddress << 8);

            ulong shaderGpuVa = ((ulong)_state.State.SetProgramRegionAAddressUpper << 32) | _state.State.SetProgramRegionB;

--- a/src/Ryujinx.Graphics.Gpu/Engine/DeviceStateWithShadow.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/DeviceStateWithShadow.cs
@@ -80,7 +80,7 @@ namespace Ryujinx.Graphics.Gpu.Engine
        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void WriteWithRedundancyCheck(int offset, int value, out bool changed)
        {
-            SetMmeShadowRamControlMode shadowRamControl = _state.State.SetMmeShadowRamControlMode;
+            var shadowRamControl = _state.State.SetMmeShadowRamControlMode;
            if (shadowRamControl == SetMmeShadowRamControlMode.MethodPassthrough || offset < 0x200)
            {
                _state.WriteWithRedundancyCheck(offset, value, out changed);
--- a/src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/Dma/DmaClass.cs
@@ -190,7 +190,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
        /// <param name="argument">The LaunchDma call argument</param>
        private void DmaCopy(int argument)
        {
-            MemoryManager memoryManager = _channel.MemoryManager;
+            var memoryManager = _channel.MemoryManager;

            CopyFlags copyFlags = (CopyFlags)argument;

@@ -225,8 +225,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                int srcBpp = remap ? srcComponents * componentSize : 1;
                int dstBpp = remap ? dstComponents * componentSize : 1;

-                DmaTexture dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
-                DmaTexture src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);
+                var dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
+                var src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);

                int srcRegionX = 0, srcRegionY = 0, dstRegionX = 0, dstRegionY = 0;

@@ -245,7 +245,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                int srcStride = (int)_state.State.PitchIn;
                int dstStride = (int)_state.State.PitchOut;

-                OffsetCalculator srcCalculator = new(
+                var srcCalculator = new OffsetCalculator(
                    src.Width,
                    src.Height,
                    srcStride,
@@ -254,7 +254,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                    src.MemoryLayout.UnpackGobBlocksInZ(),
                    srcBpp);

-                OffsetCalculator dstCalculator = new(
+                var dstCalculator = new OffsetCalculator(
                    dst.Width,
                    dst.Height,
                    dstStride,
@@ -293,7 +293,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma

                if (completeSource && completeDest && !srcLinear && isIdentityRemap)
                {
-                    Image.Texture source = memoryManager.Physical.TextureCache.FindTexture(
+                    var source = memoryManager.Physical.TextureCache.FindTexture(
                        memoryManager,
                        srcGpuVa,
                        srcBpp,
@@ -309,7 +309,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                    {
                        source.SynchronizeMemory();

-                        Image.Texture target = memoryManager.Physical.TextureCache.FindOrCreateTexture(
+                        var target = memoryManager.Physical.TextureCache.FindOrCreateTexture(
                            memoryManager,
                            source.Info.FormatInfo,
                            dstGpuVa,
@@ -339,7 +339,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma

                if (completeSource && completeDest && !(dstLinear && !srcLinear) && isIdentityRemap)
                {
-                    Image.Texture target = memoryManager.Physical.TextureCache.FindTexture(
+                    var target = memoryManager.Physical.TextureCache.FindTexture(
                        memoryManager,
                        dstGpuVa,
                        dstBpp,
--- a/src/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/GPFifo/GPFifoProcessor.cs
@@ -159,7 +159,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.GPFifo
                int availableCount = commandBuffer.Length - offset;
                int consumeCount = Math.Min(_state.MethodCount, availableCount);

-                ReadOnlySpan<int> data = commandBuffer.Slice(offset, consumeCount);
+                var data = commandBuffer.Slice(offset, consumeCount);

                if (_state.SubChannel == 0)
                {
--- a/src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs
@@ -1,7 +1,6 @@
 using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.Device;
-using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
 using System;
 using System.Collections.Generic;
@@ -169,9 +168,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
        /// </summary>
        private void FinishTransfer()
        {
-            MemoryManager memoryManager = _channel.MemoryManager;
+            var memoryManager = _channel.MemoryManager;

-            Span<byte> data = MemoryMarshal.Cast<int, byte>(_buffer)[.._size];
+            var data = MemoryMarshal.Cast<int, byte>(_buffer)[.._size];

            if (_isLinear && _lineCount == 1)
            {
@@ -185,7 +184,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                // Right now the copy code at the bottom assumes that it is used on both which might be incorrect.
                if (!_isLinear)
                {
-                    Image.Texture target = memoryManager.Physical.TextureCache.FindTexture(
+                    var target = memoryManager.Physical.TextureCache.FindTexture(
                        memoryManager,
                        _dstGpuVa,
                        1,
@@ -200,7 +199,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                    if (target != null)
                    {
                        target.SynchronizeMemory();
-                        MemoryOwner<byte> dataCopy = MemoryOwner<byte>.RentCopy(data);
+                        var dataCopy = MemoryOwner<byte>.RentCopy(data);
                        target.SetData(dataCopy, 0, 0, new GAL.Rectangle<int>(_dstX, _dstY, _lineLengthIn / target.Info.FormatInfo.BytesPerPixel, _lineCount));
                        target.SignalModified();

@@ -208,7 +207,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                    }
                }

-                OffsetCalculator dstCalculator = new(
+                var dstCalculator = new OffsetCalculator(
                    _dstWidth,
                    _dstHeight,
                    _dstStride,
--- a/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLE.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLE.cs
@@ -285,12 +285,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <param name="arg0">First argument of the call</param>
        private void DrawArraysInstanced(IDeviceState state, int arg0)
        {
-            PrimitiveTopology topology = (PrimitiveTopology)arg0;
+            var topology = (PrimitiveTopology)arg0;

-            FifoWord count = FetchParam();
-            FifoWord instanceCount = FetchParam();
-            FifoWord firstVertex = FetchParam();
-            FifoWord firstInstance = FetchParam();
+            var count = FetchParam();
+            var instanceCount = FetchParam();
+            var firstVertex = FetchParam();
+            var firstInstance = FetchParam();

            if (ShouldSkipDraw(state, instanceCount.Word))
            {
@@ -314,13 +314,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <param name="arg0">First argument of the call</param>
        private void DrawElements(IDeviceState state, int arg0)
        {
-            PrimitiveTopology topology = (PrimitiveTopology)arg0;
+            var topology = (PrimitiveTopology)arg0;

-            FifoWord indexAddressHigh = FetchParam();
-            FifoWord indexAddressLow = FetchParam();
-            FifoWord indexType = FetchParam();
-            int firstIndex = 0;
-            FifoWord indexCount = FetchParam();
+            var indexAddressHigh = FetchParam();
+            var indexAddressLow = FetchParam();
+            var indexType = FetchParam();
+            var firstIndex = 0;
+            var indexCount = FetchParam();

            _processor.ThreedClass.UpdateIndexBuffer(
                (uint)indexAddressHigh.Word,
@@ -344,13 +344,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <param name="arg0">First argument of the call</param>
        private void DrawElementsInstanced(IDeviceState state, int arg0)
        {
-            PrimitiveTopology topology = (PrimitiveTopology)arg0;
+            var topology = (PrimitiveTopology)arg0;

-            FifoWord count = FetchParam();
-            FifoWord instanceCount = FetchParam();
-            FifoWord firstIndex = FetchParam();
-            FifoWord firstVertex = FetchParam();
-            FifoWord firstInstance = FetchParam();
+            var count = FetchParam();
+            var instanceCount = FetchParam();
+            var firstIndex = FetchParam();
+            var firstVertex = FetchParam();
+            var firstInstance = FetchParam();

            if (ShouldSkipDraw(state, instanceCount.Word))
            {
@@ -374,17 +374,17 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <param name="arg0">First argument of the call</param>
        private void DrawElementsIndirect(IDeviceState state, int arg0)
        {
-            PrimitiveTopology topology = (PrimitiveTopology)arg0;
+            var topology = (PrimitiveTopology)arg0;

-            FifoWord count = FetchParam();
-            FifoWord instanceCount = FetchParam();
-            FifoWord firstIndex = FetchParam();
-            FifoWord firstVertex = FetchParam();
-            FifoWord firstInstance = FetchParam();
+            var count = FetchParam();
+            var instanceCount = FetchParam();
+            var firstIndex = FetchParam();
+            var firstVertex = FetchParam();
+            var firstInstance = FetchParam();

            ulong indirectBufferGpuVa = count.GpuVa;

-            BufferCache bufferCache = _processor.MemoryManager.Physical.BufferCache;
+            var bufferCache = _processor.MemoryManager.Physical.BufferCache;

            bool useBuffer = bufferCache.CheckModified(_processor.MemoryManager, indirectBufferGpuVa, IndirectIndexedDataEntrySize, out ulong indirectBufferAddress);

@@ -432,7 +432,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME

            int startDraw = arg0;
            int endDraw = arg1;
-            PrimitiveTopology topology = (PrimitiveTopology)arg2;
+            var topology = (PrimitiveTopology)arg2;
            int paddingWords = arg3;
            int stride = paddingWords * 4 + 0x14;

@@ -468,12 +468,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME

            for (int i = 0; i < maxDrawCount; i++)
            {
-                FifoWord count = FetchParam();
+                var count = FetchParam();
 #pragma warning disable IDE0059 // Remove unnecessary value assignment
-                FifoWord instanceCount = FetchParam();
-                FifoWord firstIndex = FetchParam();
-                FifoWord firstVertex = FetchParam();
-                FifoWord firstInstance = FetchParam();
+                var instanceCount = FetchParam();
+                var firstIndex = FetchParam();
+                var firstVertex = FetchParam();
+                var firstInstance = FetchParam();
 #pragma warning restore IDE0059

                if (i == 0)
@@ -492,7 +492,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
                }
            }

-            BufferCache bufferCache = _processor.MemoryManager.Physical.BufferCache;
+            var bufferCache = _processor.MemoryManager.Physical.BufferCache;

            ulong indirectBufferSize = (ulong)maxDrawCount * (ulong)stride;

@@ -526,7 +526,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <returns>The call argument, or a 0 value with null address if the FIFO is empty</returns>
        private FifoWord FetchParam()
        {
-            if (!Fifo.TryDequeue(out FifoWord value))
+            if (!Fifo.TryDequeue(out var value))
            {
                Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");

--- a/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLETable.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroHLETable.cs
@@ -90,13 +90,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <returns>True if there is a implementation available and supported, false otherwise</returns>
        public static bool TryGetMacroHLEFunction(ReadOnlySpan<int> code, Capabilities caps, out MacroHLEFunctionName name)
        {
-            ReadOnlySpan<byte> mc = MemoryMarshal.Cast<int, byte>(code);
+            var mc = MemoryMarshal.Cast<int, byte>(code);

            for (int i = 0; i < _table.Length; i++)
            {
-                ref TableEntry entry = ref _table[i];
+                ref var entry = ref _table[i];

-                Hash128 hash = Hash128.ComputeHash(mc[..entry.Length]);
+                var hash = Hash128.ComputeHash(mc[..entry.Length]);
                if (hash == entry.Hash)
                {
                    if (IsMacroHLESupported(caps, entry.Name))
--- a/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroInterpreter.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroInterpreter.cs
@@ -369,7 +369,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <returns>The call argument, or 0 if the FIFO is empty</returns>
        private int FetchParam()
        {
-            if (!Fifo.TryDequeue(out FifoWord value))
+            if (!Fifo.TryDequeue(out var value))
            {
                Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");

--- a/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroJitContext.cs
+++ b/src/Ryujinx.Graphics.Gpu/Engine/MME/MacroJitContext.cs
@@ -20,7 +20,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
        /// <returns>The call argument, or 0 if the FIFO is empty</returns>
        public int FetchParam()
        {
-            if (!Fifo.TryDequeue(out FifoWord value))
+            if (!Fifo.TryDequeue(out var value))
            {
                Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Keaton	6effa13252	Merge `f3e1d9cd50` into `3b5f6170d1`	2025-01-24 23:27:47 -06:00
KeatonTheBot	f3e1d9cd50	Revert "Vulkan: Feedback loop detection and barriers (#7226 )" This reverts commit `ca59c3f499`.	2025-01-19 22:46:56 -06:00