Fix LED turning on in input settings, despite TurnOffLed being set to true (#583)

The ColorPicker auotmatically sets the LED to the selected Color
whenever the Input Settings are opened. Therefore it now checks if the
setting is turned off before changing the color.

Directory.Packages.props

@@ -42,7 +42,7 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.0.2" />
+    <PackageVersion Include="Gommon" Version="2.7.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />

src/ARMeilleure/CodeGen/Arm64/Arm64Optimizer.cs

@@ -13,13 +13,13 @@ namespace ARMeilleure.CodeGen.Arm64
 
         public static void RunPass(ControlFlowGraph cfg)
         {
-            var constants = new Dictionary<ulong, Operand>();
+            Dictionary<ulong, Operand> 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 var constant) || constant.UsesCount > MaxConstantUses)
+                if (!constants.TryGetValue(source.Value, out Operand constant) || constant.UsesCount > MaxConstantUses)
                 {
                     constant = Local(source.Type);
 

src/ARMeilleure/CodeGen/Arm64/Assembler.cs

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

src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs

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

src/ARMeilleure/CodeGen/Arm64/CodeGenerator.cs

@@ -322,7 +322,7 @@ namespace ARMeilleure.CodeGen.Arm64
 
             Debug.Assert(comp.Kind == OperandKind.Constant);
 
-            var cond = ((Comparison)comp.AsInt32()).ToArmCondition();
+            ArmCondition 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);
 
-            var cond = ((Comparison)comp.AsInt32()).ToArmCondition();
+            ArmCondition cond = ((Comparison)comp.AsInt32()).ToArmCondition();
 
             GenerateCompareCommon(context, operation);
 

src/ARMeilleure/CodeGen/Arm64/PreAllocator.cs

@@ -847,7 +847,7 @@ namespace ARMeilleure.CodeGen.Arm64
 
                         Debug.Assert(comp.Kind == OperandKind.Constant);
 
-                        var compType = (Comparison)comp.AsInt32();
+                        Comparison compType = (Comparison)comp.AsInt32();
 
                         return compType == Comparison.Equal || compType == Comparison.NotEqual;
                     }

src/ARMeilleure/CodeGen/RegisterAllocators/LinearScanAllocator.cs

@@ -115,7 +115,7 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
         {
             NumberLocals(cfg, regMasks.RegistersCount);
 
-            var context = new AllocationContext(stackAlloc, regMasks, _intervals.Count);
+            AllocationContext context = new AllocationContext(stackAlloc, regMasks, _intervals.Count);
 
             BuildIntervals(cfg, context);
 

src/ARMeilleure/CodeGen/RegisterAllocators/LiveIntervalList.cs

@@ -15,12 +15,12 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
         {
             if (_count + 1 > _capacity)
             {
-                var oldSpan = Span;
+                Span<LiveInterval> oldSpan = Span;
 
                 _capacity = Math.Max(4, _capacity * 2);
                 _items = Allocators.References.Allocate<LiveInterval>((uint)_capacity);
 
-                var newSpan = Span;
+                Span<LiveInterval> newSpan = Span;
 
                 oldSpan.CopyTo(newSpan);
             }

src/ARMeilleure/CodeGen/RegisterAllocators/UseList.cs

@@ -16,12 +16,12 @@ namespace ARMeilleure.CodeGen.RegisterAllocators
         {
             if (Count + 1 > _capacity)
             {
-                var oldSpan = Span;
+                Span<int> oldSpan = Span;
 
                 _capacity = Math.Max(4, _capacity * 2);
                 _items = Allocators.Default.Allocate<int>((uint)_capacity);
 
-                var newSpan = Span;
+                Span<int> newSpan = Span;
 
                 oldSpan.CopyTo(newSpan);
             }

src/ARMeilleure/CodeGen/X86/Assembler.cs

@@ -1,5 +1,6 @@
 using ARMeilleure.CodeGen.Linking;
 using ARMeilleure.IntermediateRepresentation;
+using Microsoft.IO;
 using Ryujinx.Common.Memory;
 using System;
 using System.Collections.Generic;
@@ -1324,8 +1325,8 @@ namespace ARMeilleure.CodeGen.X86
 
         public (byte[], RelocInfo) GetCode()
         {
-            var jumps = CollectionsMarshal.AsSpan(_jumps);
-            var relocs = CollectionsMarshal.AsSpan(_relocs);
+            Span<Jump> jumps = CollectionsMarshal.AsSpan(_jumps);
+            Span<Reloc> relocs = CollectionsMarshal.AsSpan(_relocs);
 
             // Write jump relative offsets.
             bool modified;
@@ -1410,13 +1411,13 @@ namespace ARMeilleure.CodeGen.X86
             // Write the code, ignoring the dummy bytes after jumps, into a new stream.
             _stream.Seek(0, SeekOrigin.Begin);
 
-            using var codeStream = MemoryStreamManager.Shared.GetStream();
-            var assembler = new Assembler(codeStream, HasRelocs);
+            using RecyclableMemoryStream codeStream = MemoryStreamManager.Shared.GetStream();
+            Assembler assembler = new Assembler(codeStream, HasRelocs);
 
             bool hasRelocs = HasRelocs;
             int relocIndex = 0;
             int relocOffset = 0;
-            var relocEntries = hasRelocs
+            RelocEntry[] relocEntries = hasRelocs
                 ? new RelocEntry[relocs.Length]
                 : Array.Empty<RelocEntry>();
 
@@ -1469,8 +1470,8 @@ namespace ARMeilleure.CodeGen.X86
 
             _stream.CopyTo(codeStream);
 
-            var code = codeStream.ToArray();
-            var relocInfo = new RelocInfo(relocEntries);
+            byte[] code = codeStream.ToArray();
+            RelocInfo relocInfo = new RelocInfo(relocEntries);
 
             return (code, relocInfo);
         }

src/ARMeilleure/CodeGen/X86/CodeGenerator.cs

@@ -623,7 +623,7 @@ namespace ARMeilleure.CodeGen.X86
 
             Debug.Assert(comp.Kind == OperandKind.Constant);
 
-            var cond = ((Comparison)comp.AsInt32()).ToX86Condition();
+            X86Condition 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);
 
-            var cond = ((Comparison)comp.AsInt32()).ToX86Condition();
+            X86Condition cond = ((Comparison)comp.AsInt32()).ToX86Condition();
 
             GenerateCompareCommon(context, operation);
 

src/ARMeilleure/CodeGen/X86/HardwareCapabilities.cs

@@ -53,7 +53,7 @@ namespace ARMeilleure.CodeGen.X86
 
             memGetXcr0.Reprotect(0, (ulong)asmGetXcr0.Length, MemoryPermission.ReadAndExecute);
 
-            var fGetXcr0 = Marshal.GetDelegateForFunctionPointer<GetXcr0>(memGetXcr0.Pointer);
+            GetXcr0 fGetXcr0 = Marshal.GetDelegateForFunctionPointer<GetXcr0>(memGetXcr0.Pointer);
 
             return fGetXcr0();
         }

src/ARMeilleure/CodeGen/X86/PreAllocator.cs

@@ -759,7 +759,7 @@ namespace ARMeilleure.CodeGen.X86
 
                         Debug.Assert(comp.Kind == OperandKind.Constant);
 
-                        var compType = (Comparison)comp.AsInt32();
+                        Comparison compType = (Comparison)comp.AsInt32();
 
                         return compType == Comparison.Equal || compType == Comparison.NotEqual;
                     }

src/ARMeilleure/CodeGen/X86/X86Optimizer.cs

@@ -13,13 +13,13 @@ namespace ARMeilleure.CodeGen.X86
 
         public static void RunPass(ControlFlowGraph cfg)
         {
-            var constants = new Dictionary<ulong, Operand>();
+            Dictionary<ulong, Operand> 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 var constant) || constant.UsesCount > MaxConstantUses)
+                if (!constants.TryGetValue(source.Value, out Operand constant) || constant.UsesCount > MaxConstantUses)
                 {
                     constant = Local(source.Type);
 

src/ARMeilleure/Common/BitMap.cs

@@ -129,13 +129,13 @@ namespace ARMeilleure.Common
 
             if (count > _count)
             {
-                var oldMask = _masks;
-                var oldSpan = new Span<long>(_masks, _count);
+                long* oldMask = _masks;
+                Span<long> oldSpan = new Span<long>(_masks, _count);
 
                 _masks = _allocator.Allocate<long>((uint)count);
                 _count = count;
 
-                var newSpan = new Span<long>(_masks, _count);
+                Span<long> newSpan = new Span<long>(_masks, _count);
 
                 oldSpan.CopyTo(newSpan);
                 newSpan[oldSpan.Length..].Clear();

src/ARMeilleure/Common/EntryTable.cs

@@ -63,7 +63,7 @@ namespace ARMeilleure.Common
                 }
 
                 int index = _freeHint++;
-                var page = GetPage(index);
+                Span<TEntry> 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));
                 }
 
-                var page = GetPage(index);
+                Span<TEntry> 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)
         {
-            var pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
+            int pageIndex = (int)((uint)(index & ~(_pageCapacity - 1)) >> _pageLogCapacity);
 
             if (!_pages.TryGetValue(pageIndex, out nint page))
             {
@@ -168,7 +168,7 @@ namespace ARMeilleure.Common
             {
                 _allocated.Dispose();
 
-                foreach (var page in _pages.Values)
+                foreach (IntPtr page in _pages.Values)
                 {
                     NativeAllocator.Instance.Free((void*)page);
                 }

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)
         {
-            var opc = (opCode >> 16) & 0xf;
+            int opc = (opCode >> 16) & 0xf;
 
             if ((opc & 0b1) == 1)
             {

src/ARMeilleure/Decoders/OpCode32SimdMovGpElem.cs

@@ -21,7 +21,7 @@ namespace ARMeilleure.Decoders
             Op = (opCode >> 20) & 0x1;
             U = ((opCode >> 23) & 1) != 0;
 
-            var opc = (((opCode >> 23) & 1) << 4) | (((opCode >> 21) & 0x3) << 2) | ((opCode >> 5) & 0x3);
+            int opc = (((opCode >> 23) & 1) << 4) | (((opCode >> 21) & 0x3) << 2) | ((opCode >> 5) & 0x3);
 
             if ((opc & 0b01000) == 0b01000)
             {

src/ARMeilleure/Decoders/OpCodeAluImm.cs

@@ -20,7 +20,7 @@ namespace ARMeilleure.Decoders
             }
             else if (DataOp == DataOp.Logical)
             {
-                var bm = DecoderHelper.DecodeBitMask(opCode, true);
+                DecoderHelper.BitMask bm = DecoderHelper.DecodeBitMask(opCode, true);
 
                 if (bm.IsUndefined)
                 {

src/ARMeilleure/Decoders/OpCodeBfm.cs

@@ -11,7 +11,7 @@ namespace ARMeilleure.Decoders
 
         public OpCodeBfm(InstDescriptor inst, ulong address, int opCode) : base(inst, address, opCode)
         {
-            var bm = DecoderHelper.DecodeBitMask(opCode, false);
+            DecoderHelper.BitMask bm = DecoderHelper.DecodeBitMask(opCode, false);
 
             if (bm.IsUndefined)
             {

src/ARMeilleure/Decoders/Optimizations/TailCallRemover.cs

@@ -69,7 +69,7 @@ namespace ARMeilleure.Decoders.Optimizations
                 }
             }
 
-            var newBlocks = new List<Block>(blocks.Count);
+            List<Block> 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++)

src/ARMeilleure/Diagnostics/IRDumper.cs

@@ -141,7 +141,7 @@ namespace ARMeilleure.Diagnostics
                     break;
 
                 case OperandKind.Memory:
-                    var memOp = operand.GetMemory();
+                    MemoryOperand memOp = operand.GetMemory();
 
                     _builder.Append('[');
 
@@ -285,7 +285,7 @@ namespace ARMeilleure.Diagnostics
 
         public static string GetDump(ControlFlowGraph cfg)
         {
-            var dumper = new IRDumper(1);
+            IRDumper dumper = new IRDumper(1);
 
             for (BasicBlock block = cfg.Blocks.First; block != null; block = block.ListNext)
             {

src/ARMeilleure/Instructions/InstEmitAlu32.cs

@@ -415,7 +415,7 @@ namespace ARMeilleure.Instructions
         {
             IOpCode32AluBf op = (IOpCode32AluBf)context.CurrOp;
 
-            var msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
+            int 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;
 
-            var msb = op.Lsb + op.Msb; // For this instruction, the msb is actually a width.
+            int 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));

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -1,4 +1,5 @@
 using ARMeilleure.CodeGen.Linking;
+using ARMeilleure.Common;
 using ARMeilleure.Decoders;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
@@ -193,7 +194,7 @@ namespace ARMeilleure.Instructions
 
             Operand hostAddress;
 
-            var table = context.FunctionTable;
+            IAddressTable<ulong> table = context.FunctionTable;
 
             // If address is mapped onto the function table, we can skip the table walk. Otherwise we fallback
             // onto the dispatch stub.
@@ -218,7 +219,7 @@ namespace ARMeilleure.Instructions
 
                 for (int i = 0; i < table.Levels.Length; i++)
                 {
-                    var level = table.Levels[i];
+                    AddressTableLevel level = table.Levels[i];
                     int clearBits = 64 - (level.Index + level.Length);
 
                     Operand index = context.ShiftLeft(

src/ARMeilleure/Instructions/InstEmitMemoryEx32.cs

@@ -143,8 +143,8 @@ namespace ARMeilleure.Instructions
 
             Operand address = context.Copy(GetIntA32(context, op.Rn));
 
-            var exclusive = (accType & AccessType.Exclusive) != 0;
-            var ordered = (accType & AccessType.Ordered) != 0;
+            bool exclusive = (accType & AccessType.Exclusive) != 0;
+            bool ordered = (accType & AccessType.Ordered) != 0;
 
             if ((accType & AccessType.Load) != 0)
             {

src/ARMeilleure/Instructions/InstEmitSimdCmp32.cs

@@ -229,7 +229,7 @@ namespace ARMeilleure.Instructions
 
         private static Operand ZerosOrOnes(ArmEmitterContext context, Operand fromBool, OperandType baseType)
         {
-            var ones = (baseType == OperandType.I64) ? Const(-1L) : Const(-1);
+            Operand ones = (baseType == OperandType.I64) ? Const(-1L) : Const(-1);
 
             return context.ConditionalSelect(fromBool, ones, Const(baseType, 0L));
         }

src/ARMeilleure/Instructions/InstEmitSimdCvt32.cs

@@ -118,15 +118,15 @@ namespace ARMeilleure.Instructions
         {
             OpCode32SimdCvtFFixed op = (OpCode32SimdCvtFFixed)context.CurrOp;
 
-            var toFixed = op.Opc == 1;
+            bool toFixed = op.Opc == 1;
             int fracBits = op.Fbits;
-            var unsigned = op.U;
+            bool unsigned = op.U;
 
             if (toFixed) // F32 to S32 or U32 (fixed)
             {
                 EmitVectorUnaryOpF32(context, (op1) =>
                 {
-                    var scaledValue = context.Multiply(op1, ConstF(MathF.Pow(2f, fracBits)));
+                    Operand 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) =>
                 {
-                    var floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);
+                    Operand floatValue = unsigned ? context.ConvertToFPUI(OperandType.FP32, op1) : context.ConvertToFP(OperandType.FP32, op1);
 
                     return context.Multiply(floatValue, ConstF(1f / MathF.Pow(2f, fracBits)));
                 }, !unsigned);

src/ARMeilleure/Instructions/InstEmitSimdMemory32.cs

@@ -87,7 +87,7 @@ namespace ARMeilleure.Instructions
                         {
                             if (op.Replicate)
                             {
-                                var regs = (count > 1) ? 1 : op.Increment;
+                                int regs = (count > 1) ? 1 : op.Increment;
                                 for (int reg = 0; reg < regs; reg++)
                                 {
                                     int dreg = reg + d;

src/ARMeilleure/Instructions/SoftFloat.cs

@@ -1538,7 +1538,7 @@ namespace ARMeilleure.Instructions
             }
             else if (MathF.Abs(value) < MathF.Pow(2f, -128))
             {
-                var overflowToInf = fpcr.GetRoundingMode() switch
+                bool 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))
             {
-                var overflowToInf = fpcr.GetRoundingMode() switch
+                bool overflowToInf = fpcr.GetRoundingMode() switch
                 {
                     FPRoundingMode.ToNearest => true,
                     FPRoundingMode.TowardsPlusInfinity => !sign,

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);
 
-                var oldSpan = new Span<T>(data, count);
+                Span<T> oldSpan = new Span<T>(data, count);
 
                 capacity = newCapacity;
                 data = Allocators.References.Allocate<T>(capacity);
@@ -338,7 +338,7 @@ namespace ARMeilleure.IntermediateRepresentation
                     throw new OverflowException();
                 }
 
-                var oldSpan = new Span<T>(data, (int)count);
+                Span<T> 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
         {
-            var span = new Span<T>(data, count);
+            Span<T> 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
         {
-            var span = new Span<T>(data, (int)count);
+            Span<T> span = new Span<T>(data, (int)count);
 
             for (int i = 0; i < span.Length; i++)
             {

src/ARMeilleure/Signal/TestMethods.cs

@@ -22,7 +22,7 @@ namespace ARMeilleure.Signal
         {
             EmitterContext context = new();
 
-            var result = WindowsPartialUnmapHandler.EmitRetryFromAccessViolation(context);
+            Operand result = WindowsPartialUnmapHandler.EmitRetryFromAccessViolation(context);
 
             context.Return(result);
 
@@ -39,7 +39,7 @@ namespace ARMeilleure.Signal
         {
             EmitterContext context = new();
 
-            var result = WindowsPartialUnmapHandler.EmitThreadLocalMapIntGetOrReserve(context, structPtr, context.LoadArgument(OperandType.I32, 0), context.LoadArgument(OperandType.I32, 1));
+            Operand result = WindowsPartialUnmapHandler.EmitThreadLocalMapIntGetOrReserve(context, structPtr, context.LoadArgument(OperandType.I32, 0), context.LoadArgument(OperandType.I32, 1));
 
             context.Return(result);
 

src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs

@@ -100,13 +100,13 @@ namespace ARMeilleure.Translation.Cache
                 return null; // Not found.
             }
 
-            var unwindInfo = funcEntry.UnwindInfo;
+            CodeGen.Unwinding.UnwindInfo unwindInfo = funcEntry.UnwindInfo;
 
             int codeIndex = 0;
 
             for (int index = unwindInfo.PushEntries.Length - 1; index >= 0; index--)
             {
-                var entry = unwindInfo.PushEntries[index];
+                UnwindPushEntry entry = unwindInfo.PushEntries[index];
 
                 switch (entry.PseudoOp)
                 {

src/ARMeilleure/Translation/ControlFlowGraph.cs

@@ -47,8 +47,8 @@ namespace ARMeilleure.Translation
         {
             RemoveUnreachableBlocks(Blocks);
 
-            var visited = new HashSet<BasicBlock>();
-            var blockStack = new Stack<BasicBlock>();
+            HashSet<BasicBlock> visited = new HashSet<BasicBlock>();
+            Stack<BasicBlock> 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)
         {
-            var visited = new HashSet<BasicBlock>();
-            var workQueue = new Queue<BasicBlock>();
+            HashSet<BasicBlock> visited = new HashSet<BasicBlock>();
+            Queue<BasicBlock> workQueue = new Queue<BasicBlock>();
 
             visited.Add(Entry);
             workQueue.Enqueue(Entry);

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -9,6 +9,7 @@ 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;
@@ -562,7 +563,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 var value) && value.HighCq))
+                    if (isEntryChanged || (!infoEntry.HighCq && Profiler.ProfiledFuncs.TryGetValue(infoEntry.Address, out PtcProfiler.FuncProfile value) && value.HighCq))
                     {
                         infoEntry.Stubbed = true;
                         infoEntry.CodeLength = 0;
@@ -749,8 +750,8 @@ namespace ARMeilleure.Translation.PTC
             UnwindInfo unwindInfo,
             bool highCq)
         {
-            var cFunc = new CompiledFunction(code, unwindInfo, RelocInfo.Empty);
-            var gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
+            CompiledFunction cFunc = new CompiledFunction(code, unwindInfo, RelocInfo.Empty);
+            GuestFunction gFunc = cFunc.MapWithPointer<GuestFunction>(out nint gFuncPointer);
 
             return new TranslatedFunction(gFunc, gFuncPointer, callCounter, guestSize, highCq);
         }
@@ -787,7 +788,7 @@ namespace ARMeilleure.Translation.PTC
 
         public void MakeAndSaveTranslations(Translator translator)
         {
-            var profiledFuncsToTranslate = Profiler.GetProfiledFuncsToTranslate(translator.Functions);
+            ConcurrentQueue<(ulong address, PtcProfiler.FuncProfile funcProfile)> profiledFuncsToTranslate = Profiler.GetProfiledFuncsToTranslate(translator.Functions);
 
             _translateCount = 0;
             _translateTotalCount = profiledFuncsToTranslate.Count;
@@ -831,7 +832,7 @@ namespace ARMeilleure.Translation.PTC
 
             void TranslateFuncs()
             {
-                while (profiledFuncsToTranslate.TryDequeue(out var item))
+                while (profiledFuncsToTranslate.TryDequeue(out (ulong address, PtcProfiler.FuncProfile funcProfile) item))
                 {
                     ulong address = item.address;
 
@@ -866,11 +867,11 @@ namespace ARMeilleure.Translation.PTC
 
             Stopwatch sw = Stopwatch.StartNew();
 
-            foreach (var thread in threads)
+            foreach (Thread thread in threads)
             {
                 thread.Start();
             }
-            foreach (var thread in threads)
+            foreach (Thread thread in threads)
             {
                 thread.Join();
             }
@@ -944,7 +945,7 @@ namespace ARMeilleure.Translation.PTC
                 WriteCode(code.AsSpan());
 
                 // WriteReloc.
-                using var relocInfoWriter = new BinaryWriter(_relocsStream, EncodingCache.UTF8NoBOM, true);
+                using BinaryWriter relocInfoWriter = new BinaryWriter(_relocsStream, EncodingCache.UTF8NoBOM, true);
 
                 foreach (RelocEntry entry in relocInfo.Entries)
                 {
@@ -954,7 +955,7 @@ namespace ARMeilleure.Translation.PTC
                 }
 
                 // WriteUnwindInfo.
-                using var unwindInfoWriter = new BinaryWriter(_unwindInfosStream, EncodingCache.UTF8NoBOM, true);
+                using BinaryWriter unwindInfoWriter = new BinaryWriter(_unwindInfosStream, EncodingCache.UTF8NoBOM, true);
 
                 unwindInfoWriter.Write(unwindInfo.PushEntries.Length);
 

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -111,9 +111,9 @@ namespace ARMeilleure.Translation.PTC
 
         public ConcurrentQueue<(ulong address, FuncProfile funcProfile)> GetProfiledFuncsToTranslate(TranslatorCache<TranslatedFunction> funcs)
         {
-            var profiledFuncsToTranslate = new ConcurrentQueue<(ulong address, FuncProfile funcProfile)>();
+            ConcurrentQueue<(ulong address, FuncProfile funcProfile)> profiledFuncsToTranslate = new ConcurrentQueue<(ulong address, FuncProfile funcProfile)>();
 
-            foreach (var profiledFunc in ProfiledFuncs)
+            foreach (KeyValuePair<ulong, FuncProfile> profiledFunc in ProfiledFuncs)
             {
                 if (!funcs.ContainsKey(profiledFunc.Key))
                 {

src/ARMeilleure/Translation/SsaConstruction.cs

@@ -44,10 +44,10 @@ namespace ARMeilleure.Translation
 
         public static void Construct(ControlFlowGraph cfg)
         {
-            var globalDefs = new DefMap[cfg.Blocks.Count];
-            var localDefs = new Operand[cfg.LocalsCount + RegisterConsts.TotalCount];
+            DefMap[] globalDefs = new DefMap[cfg.Blocks.Count];
+            Operand[] localDefs = new Operand[cfg.LocalsCount + RegisterConsts.TotalCount];
 
-            var dfPhiBlocks = new Queue<BasicBlock>();
+            Queue<BasicBlock> dfPhiBlocks = new Queue<BasicBlock>();
 
             for (BasicBlock block = cfg.Blocks.First; block != null; block = block.ListNext)
             {

src/ARMeilleure/Translation/Translator.cs

@@ -222,7 +222,7 @@ namespace ARMeilleure.Translation
 
         internal TranslatedFunction Translate(ulong address, ExecutionMode mode, bool highCq, bool singleStep = false)
         {
-            var context = new ArmEmitterContext(
+            ArmEmitterContext context = new ArmEmitterContext(
                 Memory,
                 CountTable,
                 FunctionTable,
@@ -259,10 +259,10 @@ namespace ARMeilleure.Translation
 
             Logger.EndPass(PassName.RegisterUsage);
 
-            var retType = OperandType.I64;
-            var argTypes = new OperandType[] { OperandType.I64 };
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new OperandType[] { OperandType.I64 };
 
-            var options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;
+            CompilerOptions options = highCq ? CompilerOptions.HighCq : CompilerOptions.None;
 
             if (context.HasPtc && !singleStep)
             {
@@ -521,7 +521,7 @@ namespace ARMeilleure.Translation
 
             List<TranslatedFunction> functions = Functions.AsList();
 
-            foreach (var func in functions)
+            foreach (TranslatedFunction func in functions)
             {
                 JitCache.Unmap(func.FuncPointer);
 
@@ -530,7 +530,7 @@ namespace ARMeilleure.Translation
 
             Functions.Clear();
 
-            while (_oldFuncs.TryDequeue(out var kv))
+            while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> 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 var func) && func.CallCounter != null)
+                    if (Functions.TryGetValue(request.Address, out TranslatedFunction func) && func.CallCounter != null)
                     {
                         Volatile.Write(ref func.CallCounter.Value, 0);
                     }

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -142,7 +142,7 @@ namespace ARMeilleure.Translation
         /// <returns>Generated <see cref="DispatchStub"/></returns>
         private nint GenerateDispatchStub()
         {
-            var context = new EmitterContext();
+            EmitterContext 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 var level = ref _functionTable.Levels[i];
+                ref AddressTableLevel 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);
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new[] { OperandType.I64 };
 
-            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction 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()
         {
-            var context = new EmitterContext();
+            EmitterContext 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);
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new[] { OperandType.I64 };
 
-            var func = Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<GuestFunction>();
+            GuestFunction 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()
         {
-            var context = new EmitterContext();
+            EmitterContext context = new EmitterContext();
 
             Operand beginLbl = Label();
             Operand endLbl = Label();
@@ -279,9 +279,9 @@ namespace ARMeilleure.Translation
 
             context.Return();
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.None;
-            var argTypes = new[] { OperandType.I64, OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.None;
+            OperandType[] 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()
         {
-            var context = new EmitterContext();
+            EmitterContext 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);
 
-            var cfg = context.GetControlFlowGraph();
-            var retType = OperandType.I64;
-            var argTypes = new[] { OperandType.I64, OperandType.I64 };
+            ControlFlowGraph cfg = context.GetControlFlowGraph();
+            OperandType retType = OperandType.I64;
+            OperandType[] argTypes = new[] { OperandType.I64, OperandType.I64 };
 
             return Compiler.Compile(cfg, argTypes, retType, CompilerOptions.HighCq, RuntimeInformation.ProcessArchitecture).Map<WrapperFunction>();
         }

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 var spec, 0);
+            int res = SDL_GetDefaultAudioInfo(nint.Zero, out SDL_AudioSpec spec, 0);
 
             if (res != 0)
             {

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

@@ -38,7 +38,7 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
             get => Marshal.PtrToStringAnsi(GetOutContext().Name);
             set
             {
-                var context = GetOutContext();
+                SoundIoOutStream context = GetOutContext();
 
                 if (_nameStored != nint.Zero && context.Name == _nameStored)
                 {
@@ -129,8 +129,8 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
 
             unsafe
             {
-                var frameCountPtr = &nativeFrameCount;
-                var arenasPtr = &arenas;
+                int* frameCountPtr = &nativeFrameCount;
+                IntPtr* arenasPtr = &arenas;
                 CheckError(soundio_outstream_begin_write(_context, (nint)arenasPtr, (nint)frameCountPtr));
 
                 frameCount = *frameCountPtr;

src/Ryujinx.Audio/Renderer/Utils/FileHardwareDevice.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Audio.Renderer.Utils
 
         private void UpdateHeader()
         {
-            var writer = new BinaryWriter(_stream);
+            BinaryWriter writer = new(_stream);
 
             long currentPos = writer.Seek(0, SeekOrigin.Current);
 

src/Ryujinx.Common/AsyncWorkQueue.cs

@@ -34,7 +34,7 @@ namespace Ryujinx.Common
         {
             try
             {
-                foreach (var item in _queue.GetConsumingEnumerable(_cts.Token))
+                foreach (T item in _queue.GetConsumingEnumerable(_cts.Token))
                 {
                     _workerAction(item);
                 }

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -23,8 +23,9 @@ namespace Ryujinx.Common.Configuration
 
         public static EnabledDirtyHack Unpack(ulong packedHack)
         {
-            var unpackedFields = packedHack.UnpackBitFields(PackedFormat);
-            if (unpackedFields is not [var hack, var value])
+            uint[] unpackedFields = packedHack.UnpackBitFields(PackedFormat);
+            // ReSharper disable once PatternAlwaysMatches
+            if (unpackedFields is not [uint hack, uint value])
                 throw new Exception("The unpack operation on the integer resulted in an invalid unpacked result.");
             
             return new EnabledDirtyHack((DirtyHack)hack, (int)value);
@@ -53,7 +54,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 var value) ? value : -1;
+        public new int this[DirtyHack hack] => TryGetValue(hack, out int value) ? value : -1;
 
         public bool IsEnabled(DirtyHack hack) => ContainsKey(hack);
     }

src/Ryujinx.Common/Extensions/SequenceReaderExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Buffers;
 using System.Diagnostics;
+using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -16,15 +17,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)
         {
-            var initialConsumed = reader.Consumed;
+            long initialConsumed = reader.Consumed;
 
             reader.Rewind(initialConsumed);
 
-            using (var fileStream = System.IO.File.Create(fileFullName, 4096, System.IO.FileOptions.None))
+            using (FileStream fileStream = System.IO.File.Create(fileFullName, 4096, System.IO.FileOptions.None))
             {
                 while (reader.End == false)
                 {
-                    var span = reader.CurrentSpan;
+                    ReadOnlySpan<byte> span = reader.CurrentSpan;
                     fileStream.Write(span);
                     reader.Advance(span.Length);
                 }

src/Ryujinx.Common/Helpers/FileAssociationHelper.cs

@@ -101,7 +101,7 @@ namespace Ryujinx.Common.Helper
             {
                 RegistryKey key = Registry.CurrentUser.OpenSubKey(@$"Software\Classes\{ext}");
 
-                var openCmd = key?.OpenSubKey(@"shell\open\command");
+                RegistryKey openCmd = key?.OpenSubKey(@"shell\open\command");
                 
                 if (openCmd is null)
                 {
@@ -143,7 +143,7 @@ namespace Ryujinx.Common.Helper
                 }
                 else
                 {
-                    using var key = Registry.CurrentUser.CreateSubKey(keyString);
+                    using RegistryKey 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 var openCmd = key.CreateSubKey(@"shell\open\command");
+                    using RegistryKey openCmd = key.CreateSubKey(@"shell\open\command");
                     openCmd.SetValue(string.Empty, $"\"{Environment.ProcessPath}\" \"%1\"");
                     Logger.Debug?.Print(LogClass.Application, $"Added type association {ext}");
 

src/Ryujinx.Common/Helpers/LinuxHelper.cs

@@ -24,7 +24,7 @@ namespace Ryujinx.Common.Helper
                 return null;
             }
 
-            foreach (var searchPath in pathVar.Split(":", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
+            foreach (string searchPath in pathVar.Split(":", StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
             {
                 string binaryPath = Path.Combine(searchPath, binary);
 

src/Ryujinx.Common/Helpers/OpenHelper.cs

@@ -60,7 +60,7 @@ namespace Ryujinx.Common.Helper
                 {
                     ObjectiveC.NSString nsStringPath = new(path);
                     ObjectiveC.Object nsUrl = new("NSURL");
-                    var urlPtr = nsUrl.GetFromMessage("fileURLWithPath:", nsStringPath);
+                    ObjectiveC.Object 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");
-                var urlPtr = nsUrl.GetFromMessage("URLWithString:", nsStringPath);
+                ObjectiveC.Object urlPtr = nsUrl.GetFromMessage("URLWithString:", nsStringPath);
 
                 ObjectiveC.Object nsWorkspace = new("NSWorkspace");
                 ObjectiveC.Object sharedWorkspace = nsWorkspace.GetFromMessage("sharedWorkspace");

src/Ryujinx.Common/Logging/Formatters/DynamicObjectFormatter.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Common.Logging.Formatters
 
             sb.Append('{');
 
-            foreach (var prop in props)
+            foreach (PropertyInfo prop in props)
             {
                 sb.Append(prop.Name);
                 sb.Append(": ");
@@ -52,7 +52,7 @@ namespace Ryujinx.Common.Logging.Formatters
 
                     if (array is not null)
                     {
-                        foreach (var item in array)
+                        foreach (object? item in array)
                         {
                             sb.Append(item);
                             sb.Append(", ");

src/Ryujinx.Common/Logging/Logger.cs

@@ -193,7 +193,7 @@ namespace Ryujinx.Common.Logging
 
             _stdErrAdapter.Dispose();
 
-            foreach (var target in _logTargets)
+            foreach (ILogTarget target in _logTargets)
             {
                 target.Dispose();
             }
@@ -203,9 +203,9 @@ namespace Ryujinx.Common.Logging
 
         public static IReadOnlyCollection<LogLevel> GetEnabledLevels()
         {
-            var logs = new[] { Debug, Info, Warning, Error, Guest, AccessLog, Stub, Trace };
+            Log?[] logs = new[] { Debug, Info, Warning, Error, Guest, AccessLog, Stub, Trace };
             List<LogLevel> levels = new(logs.Length);
-            foreach (var log in logs)
+            foreach (Log? log in logs)
             {
                 if (log.HasValue)
                     levels.Add(log.Value.Level);

src/Ryujinx.Common/Logging/Targets/JsonLogTarget.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Common.Logging.Targets
 
         public void Log(object sender, LogEventArgs e)
         {
-            var logEventArgsJson = LogEventArgsJson.FromLogEventArgs(e);
+            LogEventArgsJson logEventArgsJson = LogEventArgsJson.FromLogEventArgs(e);
             JsonHelper.SerializeToStream(_stream, logEventArgsJson, LogEventJsonSerializerContext.Default.LogEventArgsJson);
         }
 

src/Ryujinx.Common/Utilities/EmbeddedResources.cs

@@ -19,21 +19,21 @@ namespace Ryujinx.Common
 
         public static byte[] Read(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return Read(assembly, path);
         }
 
         public static Task<byte[]> ReadAsync(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadAsync(assembly, path);
         }
 
         public static byte[] Read(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
@@ -44,14 +44,14 @@ namespace Ryujinx.Common
 
         public static MemoryOwner<byte> ReadFileToRentedMemory(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadFileToRentedMemory(assembly, path);
         }
 
         public static MemoryOwner<byte> ReadFileToRentedMemory(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream 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 var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
@@ -71,55 +71,55 @@ namespace Ryujinx.Common
 
         public static string ReadAllText(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadAllText(assembly, path);
         }
 
         public static Task<string> ReadAllTextAsync(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return ReadAllTextAsync(assembly, path);
         }
 
         public static string ReadAllText(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
             }
 
-            using var reader = new StreamReader(stream);
+            using StreamReader reader = new StreamReader(stream);
             return reader.ReadToEnd();
         }
 
         public async static Task<string> ReadAllTextAsync(Assembly assembly, string filename)
         {
-            using var stream = GetStream(assembly, filename);
+            using Stream stream = GetStream(assembly, filename);
             if (stream == null)
             {
                 return null;
             }
 
-            using var reader = new StreamReader(stream);
+            using StreamReader reader = new StreamReader(stream);
             return await reader.ReadToEndAsync();
         }
 
         public static Stream GetStream(string filename)
         {
-            var (assembly, path) = ResolveManifestPath(filename);
+            (Assembly assembly, string path) = ResolveManifestPath(filename);
 
             return GetStream(assembly, path);
         }
 
         public static Stream GetStream(Assembly assembly, string filename)
         {
-            var @namespace = assembly.GetName().Name;
-            var manifestUri = @namespace + "." + filename.Replace('/', '.');
+            string @namespace = assembly.GetName().Name;
+            string manifestUri = @namespace + "." + filename.Replace('/', '.');
 
-            var stream = assembly.GetManifestResourceStream(manifestUri);
+            Stream stream = assembly.GetManifestResourceStream(manifestUri);
 
             return stream;
         }
@@ -133,11 +133,11 @@ namespace Ryujinx.Common
 
         private static (Assembly, string) ResolveManifestPath(string filename)
         {
-            var segments = filename.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);
+            string[] segments = filename.Split('/', 2, StringSplitOptions.RemoveEmptyEntries);
 
             if (segments.Length >= 2)
             {
-                foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
+                foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
                 {
                     if (assembly.GetName().Name == segments[0])
                     {

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
-            var dir = new DirectoryInfo(sourceDir);
+            DirectoryInfo 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)
         {
-            var reservedChars = new HashSet<char>(Path.GetInvalidFileNameChars());
+            HashSet<char> reservedChars = new HashSet<char>(Path.GetInvalidFileNameChars());
             return string.Concat(fileName.Select(c => reservedChars.Contains(c) ? '_' : c));
         }
     }

src/Ryujinx.Common/Utilities/MessagePackObjectFormatter.cs

@@ -1,5 +1,6 @@
 using MsgPack;
 using System;
+using System.Collections.Generic;
 using System.Text;
 
 namespace Ryujinx.Common.Utilities
@@ -18,7 +19,7 @@ namespace Ryujinx.Common.Utilities
 
         public static string Format(MessagePackObject obj)
         {
-            var builder = new IndentedStringBuilder();
+            IndentedStringBuilder builder = new IndentedStringBuilder();
 
             FormatMsgPackObj(obj, builder);
 
@@ -41,7 +42,7 @@ namespace Ryujinx.Common.Utilities
             }
             else
             {
-                var literal = obj.ToObject();
+                object literal = obj.ToObject();
 
                 if (literal is String)
                 {
@@ -88,7 +89,7 @@ namespace Ryujinx.Common.Utilities
         {
             builder.Append("[ ");
 
-            foreach (var b in arr)
+            foreach (byte b in arr)
             {
                 builder.Append("0x");
                 builder.Append(ToHexChar(b >> 4));
@@ -111,7 +112,7 @@ namespace Ryujinx.Common.Utilities
                 builder.Append("0x");
             }
 
-            foreach (var b in arr)
+            foreach (byte b in arr)
             {
                 builder.Append(ToHexChar(b >> 4));
                 builder.Append(ToHexChar(b & 0xF));
@@ -122,7 +123,7 @@ namespace Ryujinx.Common.Utilities
 
         private static void FormatMsgPackMap(MessagePackObject obj, IndentedStringBuilder builder)
         {
-            var map = obj.AsDictionary();
+            MessagePackObjectDictionary map = obj.AsDictionary();
 
             builder.Append('{');
 
@@ -130,7 +131,7 @@ namespace Ryujinx.Common.Utilities
             builder.IncreaseIndent()
                    .AppendLine();
 
-            foreach (var item in map)
+            foreach (KeyValuePair<MessagePackObject, MessagePackObject> item in map)
             {
                 FormatMsgPackObj(item.Key, builder);
 
@@ -154,11 +155,11 @@ namespace Ryujinx.Common.Utilities
 
         private static void FormatMsgPackArray(MessagePackObject obj, IndentedStringBuilder builder)
         {
-            var arr = obj.AsList();
+            IList<MessagePackObject> arr = obj.AsList();
 
             builder.Append("[ ");
 
-            foreach (var item in arr)
+            foreach (MessagePackObject item in arr)
             {
                 FormatMsgPackObj(item, builder);
 

src/Ryujinx.Common/Utilities/Rainbow.cs

@@ -1,28 +1,62 @@
-using System;
+using Gommon;
+using System;
 using System.Drawing;
+using System.Threading.Tasks;
 
 namespace Ryujinx.Common.Utilities
 {
-    public class Rainbow
+    public static class Rainbow
     {
-        public const float Speed = 1;
+        public static bool CyclingEnabled { get; set; }
+
+        public static void Enable()
+        {
+            if (!CyclingEnabled)
+            {
+                CyclingEnabled = true;
+                Executor.ExecuteBackgroundAsync(async () =>
+                {
+                    while (CyclingEnabled)
+                    {
+                        await Task.Delay(15);
+                        Tick();
+                    }
+                });
+            }
+        }
+
+        public static void Disable()
+        {
+            CyclingEnabled = false;
+        }
+        
+        
+        public static float Speed { get; set; } = 1;
         
         public static Color Color { get; private set; } = Color.Blue;
 
         public static void Tick()
         {
-            Color = HsbToRgb(
-                (Color.GetHue() + Speed) / 360,
-                1, 
-                1
-                );
+            Color = HsbToRgb((Color.GetHue() + Speed) / 360);
             
-            RainbowColorUpdated?.Invoke(Color.ToArgb());
+            UpdatedHandler.Call(Color.ToArgb());
         }
 
-        public static event Action<int> RainbowColorUpdated;
+        public static void Reset()
+        {
+            Color = Color.Blue;
+            UpdatedHandler.Clear();
+        }
 
-        private static Color HsbToRgb(float hue, float saturation, float brightness)
+        public static event Action<int> Updated
+        {
+            add => UpdatedHandler.Add(value);
+            remove => UpdatedHandler.Remove(value);
+        }
+
+        internal static Event<int> UpdatedHandler = new();
+
+        private static Color HsbToRgb(float hue, float saturation = 1, float brightness = 1)
         {
             int r = 0, g = 0, b = 0;
             if (saturation == 0)

src/Ryujinx.Common/Utilities/StreamUtils.cs

@@ -1,5 +1,6 @@
 using Microsoft.IO;
 using Ryujinx.Common.Memory;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -27,7 +28,7 @@ namespace Ryujinx.Common.Utilities
 
                 MemoryOwner<byte> ownedMemory = MemoryOwner<byte>.Rent(checked((int)bytesExpected));
 
-                var destSpan = ownedMemory.Span;
+                Span<byte> destSpan = ownedMemory.Span;
 
                 int totalBytesRead = 0;
 

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)
         {
-            var enumValue = reader.GetString();
+            string? enumValue = reader.GetString();
 
             if (Enum.TryParse(enumValue, out TEnum value))
             {

src/Ryujinx.Common/Utilities/XCIFileTrimmer.cs

@@ -46,7 +46,7 @@ namespace Ryujinx.Common.Utilities
         {
             if (Path.GetExtension(filename).Equals(".XCI", StringComparison.InvariantCultureIgnoreCase))
             {
-                var trimmer = new XCIFileTrimmer(filename, log);
+                XCIFileTrimmer trimmer = new XCIFileTrimmer(filename, log);
                 return trimmer.CanBeTrimmed;
             }
 
@@ -57,7 +57,7 @@ namespace Ryujinx.Common.Utilities
         {
             if (Path.GetExtension(filename).Equals(".XCI", StringComparison.InvariantCultureIgnoreCase))
             {
-                var trimmer = new XCIFileTrimmer(filename, log);
+                XCIFileTrimmer trimmer = new XCIFileTrimmer(filename, log);
                 return trimmer.CanBeUntrimmed;
             }
 
@@ -201,7 +201,7 @@ namespace Ryujinx.Common.Utilities
         {
             long maxReads = readSizeB / XCIFileTrimmer.BufferSize;
             long read = 0;
-            var buffer = new byte[BufferSize];
+            byte[] buffer = new byte[BufferSize];
 
             while (true)
             {
@@ -267,7 +267,7 @@ namespace Ryujinx.Common.Utilities
 
             try
             {
-                var info = new FileInfo(Filename);
+                FileInfo info = new FileInfo(Filename);
                 if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
                 {
                     try
@@ -288,7 +288,7 @@ namespace Ryujinx.Common.Utilities
                     return OperationOutcome.FileSizeChanged;
                 }
 
-                var outfileStream = new FileStream(_filename, FileMode.Open, FileAccess.Write, FileShare.Write);
+                FileStream outfileStream = new FileStream(_filename, FileMode.Open, FileAccess.Write, FileShare.Write);
 
                 try
                 {
@@ -327,7 +327,7 @@ namespace Ryujinx.Common.Utilities
             {
                 Log?.Write(LogType.Info, "Untrimming...");
 
-                var info = new FileInfo(Filename);
+                FileInfo info = new FileInfo(Filename);
                 if ((info.Attributes & FileAttributes.ReadOnly) == FileAttributes.ReadOnly)
                 {
                     try
@@ -348,7 +348,7 @@ namespace Ryujinx.Common.Utilities
                     return OperationOutcome.FileSizeChanged;
                 }
 
-                var outfileStream = new FileStream(_filename, FileMode.Append, FileAccess.Write, FileShare.Write);
+                FileStream outfileStream = new FileStream(_filename, FileMode.Append, FileAccess.Write, FileShare.Write);
                 long bytesToWriteB = UntrimmedFileSizeB - FileSizeB;
 
                 try
@@ -393,7 +393,7 @@ namespace Ryujinx.Common.Utilities
 
             try
             {
-                var buffer = new byte[BufferSize];
+                byte[] buffer = new byte[BufferSize];
                 Array.Fill<byte>(buffer, XCIFileTrimmer.PaddingByte);
 
                 while (bytesLeftToWriteB > 0)

src/Ryujinx.Cpu/AddressTable.cs

@@ -49,7 +49,7 @@ namespace ARMeilleure.Common
 
             public TableSparseBlock(ulong size, Action<IntPtr> ensureMapped, PageInitDelegate pageInit)
             {
-                var block = new SparseMemoryBlock(size, pageInit, null);
+                SparseMemoryBlock 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 (var level in Levels)
+            foreach (AddressTableLevel 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()
         {
-            var block = new TableSparseBlock(_sparseBlockSize, EnsureMapped, InitLeafPage);
+            TableSparseBlock 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
         {
-            var size = sizeof(T) * length;
+            int size = sizeof(T) * length;
 
             AddressTablePage page;
 
@@ -413,10 +413,10 @@ namespace ARMeilleure.Common
             }
             else
             {
-                var address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
+                IntPtr address = (IntPtr)NativeAllocator.Instance.Allocate((uint)size);
                 page = new AddressTablePage(false, address);
 
-                var span = new Span<T>((void*)page.Address, length);
+                Span<T> span = new Span<T>((void*)page.Address, length);
                 span.Fill(fill);
             }
 
@@ -445,7 +445,7 @@ namespace ARMeilleure.Common
         {
             if (!_disposed)
             {
-                foreach (var page in _pages)
+                foreach (AddressTablePage page in _pages)
                 {
                     if (!page.IsSparse)
                     {

src/Ryujinx.Cpu/AppleHv/HvAddressSpace.cs

@@ -29,7 +29,7 @@ namespace Ryujinx.Cpu.AppleHv
 
         public HvAddressSpace(MemoryBlock backingMemory, ulong asSize)
         {
-            (_asBase, var ipaAllocator) = HvVm.CreateAddressSpace(backingMemory);
+            (_asBase, HvIpaAllocator ipaAllocator) = HvVm.CreateAddressSpace(backingMemory);
             _backingSize = backingMemory.Size;
 
             _userRange = new HvAddressSpaceRange(ipaAllocator);

src/Ryujinx.Cpu/AppleHv/HvMemoryBlockAllocator.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Cpu.AppleHv
 
         public HvMemoryBlockAllocation Allocate(ulong size, ulong alignment)
         {
-            var allocation = Allocate(size, alignment, CreateBlock);
+            Allocation allocation = Allocate(size, alignment, CreateBlock);
 
             return new HvMemoryBlockAllocation(this, allocation.Block, allocation.Offset, allocation.Size);
         }

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -233,13 +233,13 @@ namespace Ryujinx.Cpu.AppleHv
                 yield break;
             }
 
-            var guestRegions = GetPhysicalRegionsImpl(va, size);
+            IEnumerable<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
                 yield break;
             }
 
-            foreach (var guestRegion in guestRegions)
+            foreach (MemoryRange 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 (var physicalRegion in GetPhysicalRegionsImpl(va, size))
+            foreach (MemoryRange physicalRegion in GetPhysicalRegionsImpl(va, size))
             {
                 yield return physicalRegion;
             }

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 var timeBaseInfo);
+                int result = TimeApi.mach_timebase_info(out MachTimebaseInfo timeBaseInfo);
 
                 Debug.Assert(result == 0);
 

src/Ryujinx.Cpu/AppleHv/HvVm.cs

@@ -39,7 +39,7 @@ namespace Ryujinx.Cpu.AppleHv
                 baseAddress = ipaAllocator.Allocate(block.Size, AsIpaAlignment);
             }
 
-            var rwx = HvMemoryFlags.Read | HvMemoryFlags.Write | HvMemoryFlags.Exec;
+            HvMemoryFlags rwx = HvMemoryFlags.Read | HvMemoryFlags.Write | HvMemoryFlags.Exec;
 
             HvApi.hv_vm_map((ulong)block.Pointer, baseAddress, block.Size, rwx).ThrowOnError();
 

src/Ryujinx.Cpu/Jit/HostTracked/AddressSpacePartition.cs

@@ -127,7 +127,7 @@ namespace Ryujinx.Cpu.Jit.HostTracked
                 Debug.Assert(leftSize > 0);
                 Debug.Assert(rightSize > 0);
 
-                (var leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize);
+                (PrivateMemoryAllocation leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize);
 
                 PrivateMapping left = new(Address, leftSize, leftAllocation);
 

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -253,13 +253,13 @@ namespace Ryujinx.Cpu.Jit
                 yield break;
             }
 
-            var guestRegions = GetPhysicalRegionsImpl(va, size);
+            IEnumerable<MemoryRange> guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
                 yield break;
             }
 
-            foreach (var guestRegion in guestRegions)
+            foreach (MemoryRange 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 (var physicalRegion in GetPhysicalRegionsImpl(va, size))
+            foreach (MemoryRange physicalRegion in GetPhysicalRegionsImpl(va, size))
             {
                 yield return physicalRegion;
             }

src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs

@@ -340,7 +340,7 @@ namespace Ryujinx.Cpu.Jit
         {
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
+            List<MemoryRange> regions = new List<MemoryRange>();
 
             ulong regionStart = GetPhysicalAddressChecked(va);
             ulong regionSize = PageSize;

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))
             {
-                var target = memoryBlock.GetSpan(offset, data.Length);
+                Span<byte> target = memoryBlock.GetSpan(offset, data.Length);
 
                 bool changed = !data.SequenceEqual(target);
 
@@ -443,7 +443,7 @@ namespace Ryujinx.Cpu.Jit
                 return null;
             }
 
-            var regions = new List<HostMemoryRange>();
+            List<HostMemoryRange> regions = new List<HostMemoryRange>();
             ulong endVa = va + size;
 
             try

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++)
                 {
-                    var level = funcTable.Levels[i];
+                    AddressTableLevel level = funcTable.Levels[i];
                     asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
                     asm.Lsl(indexReg, indexReg, Const(3));
 

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++)
                 {
-                    var level = funcTable.Levels[i];
+                    AddressTableLevel level = funcTable.Levels[i];
                     asm.Ubfx(indexReg, guestAddress, level.Index, level.Length);
                     asm.Lsl(indexReg, indexReg, Const(3));
 

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 var entry))
+            if ((_threadLocalCache ??= new()).TryGetValue(guestAddress, out ThreadLocalCacheEntry entry))
             {
                 if (entry.IncrementUseCount() >= MinCallsForPad)
                 {

src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/Assembler.cs

@@ -41,7 +41,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int targetIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.TargetIndex = targetIndex;
             state.HasTarget = true;
@@ -68,7 +68,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -94,7 +94,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState state = _labels[label.AsInt32()];
 
             state.BranchIndex = branchIndex;
             state.HasBranch = true;
@@ -113,7 +113,7 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
         {
             int branchIndex = _code.Count;
 
-            var state = _labels[label.AsInt32()];
+            LabelState 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)
         {
-            var zr = new Operand(ZrRegister, RegisterType.Integer, rd.Type);
+            Operand zr = new Operand(ZrRegister, RegisterType.Integer, rd.Type);
             Csinc(rd, zr, zr, (ArmCondition)((int)condition ^ 1));
         }
 

src/Ryujinx.Cpu/LightningJit/Translator.cs

@@ -163,14 +163,14 @@ namespace Ryujinx.Cpu.LightningJit
         {
             List<TranslatedFunction> functions = Functions.AsList();
 
-            foreach (var func in functions)
+            foreach (TranslatedFunction func in functions)
             {
                 JitCache.Unmap(func.FuncPointer);
             }
 
             Functions.Clear();
 
-            while (_oldFuncs.TryDequeue(out var kv))
+            while (_oldFuncs.TryDequeue(out KeyValuePair<ulong, TranslatedFunction> kv))
             {
                 JitCache.Unmap(kv.Value.FuncPointer);
             }

src/Ryujinx.Cpu/LightningJit/TranslatorStubs.cs

@@ -174,7 +174,7 @@ namespace Ryujinx.Cpu.LightningJit
 
                 for (int i = 0; i < _functionTable.Levels.Length; i++)
                 {
-                    ref var level = ref _functionTable.Levels[i];
+                    ref AddressTableLevel level = ref _functionTable.Levels[i];
 
                     asm.Mov(mask, level.Mask >> level.Index);
                     asm.And(index, mask, guestAddress, ArmShiftType.Lsr, level.Index);

src/Ryujinx.Cpu/PrivateMemoryAllocator.cs

@@ -48,7 +48,7 @@ namespace Ryujinx.Cpu
             {
                 for (int i = 0; i < _freeRanges.Count; i++)
                 {
-                    var range = _freeRanges[i];
+                    Range 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)
             {
-                var range = new Range(offset, size);
+                Range 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;
-                var range = new Range(offset, size);
+                Range 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)
         {
-            var allocation = Allocate(size, alignment, CreateBlock);
+            Allocation 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++)
             {
-                var block = _blocks[i];
+                T block = _blocks[i];
 
                 if (block.Size >= size)
                 {
@@ -214,8 +214,8 @@ namespace Ryujinx.Cpu
 
             ulong blockAlignedSize = BitUtils.AlignUp(size, _blockAlignment);
 
-            var memory = new MemoryBlock(blockAlignedSize, _allocationFlags);
-            var newBlock = createBlock(memory, blockAlignedSize);
+            MemoryBlock memory = new MemoryBlock(blockAlignedSize, _allocationFlags);
+            T newBlock = createBlock(memory, blockAlignedSize);
 
             InsertBlock(newBlock);
 

src/Ryujinx.Cpu/Signal/NativeSignalHandler.cs

@@ -98,7 +98,7 @@ namespace Ryujinx.Cpu.Signal
                         _signalHandlerPtr = customSignalHandlerFactory(UnixSignalHandlerRegistration.GetSegfaultExceptionHandler().sa_handler, _signalHandlerPtr);
                     }
 
-                    var old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);
+                    UnixSignalHandlerRegistration.SigAction old = UnixSignalHandlerRegistration.RegisterExceptionHandler(_signalHandlerPtr);
 
                     config.UnixOldSigaction = (nuint)(ulong)old.sa_handler;
                     config.UnixOldSigaction3Arg = old.sa_flags & 4;

src/Ryujinx.Graphics.Device/DeviceState.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,15 +33,15 @@ namespace Ryujinx.Graphics.Device
                 _debugLogCallback = debugLogCallback;
             }
 
-            var fields = typeof(TState).GetFields();
+            FieldInfo[] fields = typeof(TState).GetFields();
             int offset = 0;
 
             for (int fieldIndex = 0; fieldIndex < fields.Length; fieldIndex++)
             {
-                var field = fields[fieldIndex];
+                FieldInfo field = fields[fieldIndex];
 
-                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 currentFieldOffset = (int)Marshal.OffsetOf<TState>(field.Name);
+                int nextFieldOffset = fieldIndex + 1 == fields.Length ? Unsafe.SizeOf<TState>() : (int)Marshal.OffsetOf<TState>(fields[fieldIndex + 1].Name);
 
                 int sizeOfField = nextFieldOffset - currentFieldOffset;
 
@@ -48,7 +49,7 @@ namespace Ryujinx.Graphics.Device
                 {
                     int index = (offset + i) / RegisterSize;
 
-                    if (callbacks != null && callbacks.TryGetValue(field.Name, out var cb))
+                    if (callbacks != null && callbacks.TryGetValue(field.Name, out RwCallback cb))
                     {
                         if (cb.Read != null)
                         {
@@ -81,7 +82,7 @@ namespace Ryujinx.Graphics.Device
             {
                 uint alignedOffset = index * RegisterSize;
 
-                var readCallback = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(_readCallbacks), (nint)index);
+                Func<int> readCallback = Unsafe.Add(ref MemoryMarshal.GetArrayDataReference(_readCallbacks), (nint)index);
                 if (readCallback != null)
                 {
                     return readCallback();
@@ -119,7 +120,7 @@ namespace Ryujinx.Graphics.Device
                 uint alignedOffset = index * RegisterSize;
                 DebugWrite(alignedOffset, data);
 
-                ref var storage = ref GetRefIntAlignedUncheck(index);
+                ref int storage = ref GetRefIntAlignedUncheck(index);
                 changed = storage != data;
                 storage = data;
 

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)
         {
-            var evt = value as ThreadedCounterEvent;
+            ThreadedCounterEvent evt = value as ThreadedCounterEvent;
             if (evt != null)
             {
                 if (compare == 0 && evt.Type == CounterType.SamplesPassed && evt.ClearCounter)

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

@@ -294,7 +294,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public IImageArray CreateImageArray(int size, bool isBuffer)
         {
-            var imageArray = new ThreadedImageArray(this);
+            ThreadedImageArray imageArray = new(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)
         {
-            var program = new ThreadedProgram(this);
+            ThreadedProgram program = new(this);
 
             SourceProgramRequest request = new(program, shaders, info);
 
@@ -319,7 +319,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
 
         public ISampler CreateSampler(SamplerCreateInfo info)
         {
-            var sampler = new ThreadedSampler(this);
+            ThreadedSampler sampler = new(this);
             New<CreateSamplerCommand>().Set(Ref(sampler), info);
             QueueCommand();
 
@@ -337,7 +337,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
         {
             if (IsGpuThread())
             {
-                var texture = new ThreadedTexture(this, info);
+                ThreadedTexture texture = new ThreadedTexture(this, info);
                 New<CreateTextureCommand>().Set(Ref(texture), info);
                 QueueCommand();
 
@@ -345,7 +345,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             }
             else
             {
-                var texture = new ThreadedTexture(this, info)
+                ThreadedTexture 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)
         {
-            var textureArray = new ThreadedTextureArray(this);
+            ThreadedTextureArray 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)
         {
-            var program = new ThreadedProgram(this);
+            ThreadedProgram program = new ThreadedProgram(this);
 
             BinaryProgramRequest request = new(program, programBinary, hasFragmentShader, info);
             Programs.Add(request);

src/Ryujinx.Graphics.GAL/ResourceLayout.cs

@@ -126,7 +126,7 @@ namespace Ryujinx.Graphics.GAL
 
             if (Descriptors != null)
             {
-                foreach (var descriptor in Descriptors)
+                foreach (ResourceDescriptor descriptor in Descriptors)
                 {
                     hasher.Add(descriptor);
                 }

src/Ryujinx.Graphics.Gpu/Engine/Compute/ComputeClass.cs

@@ -2,6 +2,7 @@ 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;
@@ -90,7 +91,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
         /// <param name="argument">Method call argument</param>
         private void SendSignalingPcasB(int argument)
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
             // Since we're going to change the state, make sure any pending instanced draws are done.
             _3dEngine.PerformDeferredDraws();
@@ -100,7 +101,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
 
             uint qmdAddress = _state.State.SendPcasA;
 
-            var qmd = _channel.MemoryManager.Read<ComputeQmd>((ulong)qmdAddress << 8);
+            ComputeQmd qmd = _channel.MemoryManager.Read<ComputeQmd>((ulong)qmdAddress << 8);
 
             ulong shaderGpuVa = ((ulong)_state.State.SetProgramRegionAAddressUpper << 32) | _state.State.SetProgramRegionB;
 

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)
         {
-            var shadowRamControl = _state.State.SetMmeShadowRamControlMode;
+            SetMmeShadowRamControlMode shadowRamControl = _state.State.SetMmeShadowRamControlMode;
             if (shadowRamControl == SetMmeShadowRamControlMode.MethodPassthrough || offset < 0x200)
             {
                 _state.WriteWithRedundancyCheck(offset, value, out changed);

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)
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager 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;
 
-                var dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
-                var src = Unsafe.As<uint, DmaTexture>(ref _state.State.SetSrcBlockSize);
+                DmaTexture dst = Unsafe.As<uint, DmaTexture>(ref _state.State.SetDstBlockSize);
+                DmaTexture 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;
 
-                var srcCalculator = new OffsetCalculator(
+                OffsetCalculator srcCalculator = new OffsetCalculator(
                     src.Width,
                     src.Height,
                     srcStride,
@@ -254,7 +254,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                     src.MemoryLayout.UnpackGobBlocksInZ(),
                     srcBpp);
 
-                var dstCalculator = new OffsetCalculator(
+                OffsetCalculator dstCalculator = new OffsetCalculator(
                     dst.Width,
                     dst.Height,
                     dstStride,
@@ -293,7 +293,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
 
                 if (completeSource && completeDest && !srcLinear && isIdentityRemap)
                 {
-                    var source = memoryManager.Physical.TextureCache.FindTexture(
+                    Image.Texture source = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,
                         srcGpuVa,
                         srcBpp,
@@ -309,7 +309,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Dma
                     {
                         source.SynchronizeMemory();
 
-                        var target = memoryManager.Physical.TextureCache.FindOrCreateTexture(
+                        Image.Texture 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)
                 {
-                    var target = memoryManager.Physical.TextureCache.FindTexture(
+                    Image.Texture target = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,
                         dstGpuVa,
                         dstBpp,

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);
 
-                var data = commandBuffer.Slice(offset, consumeCount);
+                ReadOnlySpan<int> data = commandBuffer.Slice(offset, consumeCount);
 
                 if (_state.SubChannel == 0)
                 {

src/Ryujinx.Graphics.Gpu/Engine/InlineToMemory/InlineToMemoryClass.cs

@@ -1,6 +1,7 @@
 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;
@@ -168,9 +169,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
         /// </summary>
         private void FinishTransfer()
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
-            var data = MemoryMarshal.Cast<int, byte>(_buffer)[.._size];
+            Span<byte> data = MemoryMarshal.Cast<int, byte>(_buffer)[.._size];
 
             if (_isLinear && _lineCount == 1)
             {
@@ -184,7 +185,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)
                 {
-                    var target = memoryManager.Physical.TextureCache.FindTexture(
+                    Image.Texture target = memoryManager.Physical.TextureCache.FindTexture(
                         memoryManager,
                         _dstGpuVa,
                         1,
@@ -199,7 +200,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                     if (target != null)
                     {
                         target.SynchronizeMemory();
-                        var dataCopy = MemoryOwner<byte>.RentCopy(data);
+                        MemoryOwner<byte> dataCopy = MemoryOwner<byte>.RentCopy(data);
                         target.SetData(dataCopy, 0, 0, new GAL.Rectangle<int>(_dstX, _dstY, _lineLengthIn / target.Info.FormatInfo.BytesPerPixel, _lineCount));
                         target.SignalModified();
 
@@ -207,7 +208,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.InlineToMemory
                     }
                 }
 
-                var dstCalculator = new OffsetCalculator(
+                OffsetCalculator dstCalculator = new OffsetCalculator(
                     _dstWidth,
                     _dstHeight,
                     _dstStride,

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)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var count = FetchParam();
-            var instanceCount = FetchParam();
-            var firstVertex = FetchParam();
-            var firstInstance = FetchParam();
+            FifoWord count = FetchParam();
+            FifoWord instanceCount = FetchParam();
+            FifoWord firstVertex = FetchParam();
+            FifoWord 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)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var indexAddressHigh = FetchParam();
-            var indexAddressLow = FetchParam();
-            var indexType = FetchParam();
-            var firstIndex = 0;
-            var indexCount = FetchParam();
+            FifoWord indexAddressHigh = FetchParam();
+            FifoWord indexAddressLow = FetchParam();
+            FifoWord indexType = FetchParam();
+            int firstIndex = 0;
+            FifoWord 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)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var count = FetchParam();
-            var instanceCount = FetchParam();
-            var firstIndex = FetchParam();
-            var firstVertex = FetchParam();
-            var firstInstance = FetchParam();
+            FifoWord count = FetchParam();
+            FifoWord instanceCount = FetchParam();
+            FifoWord firstIndex = FetchParam();
+            FifoWord firstVertex = FetchParam();
+            FifoWord 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)
         {
-            var topology = (PrimitiveTopology)arg0;
+            PrimitiveTopology topology = (PrimitiveTopology)arg0;
 
-            var count = FetchParam();
-            var instanceCount = FetchParam();
-            var firstIndex = FetchParam();
-            var firstVertex = FetchParam();
-            var firstInstance = FetchParam();
+            FifoWord count = FetchParam();
+            FifoWord instanceCount = FetchParam();
+            FifoWord firstIndex = FetchParam();
+            FifoWord firstVertex = FetchParam();
+            FifoWord firstInstance = FetchParam();
 
             ulong indirectBufferGpuVa = count.GpuVa;
 
-            var bufferCache = _processor.MemoryManager.Physical.BufferCache;
+            BufferCache 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;
-            var topology = (PrimitiveTopology)arg2;
+            PrimitiveTopology 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++)
             {
-                var count = FetchParam();
+                FifoWord count = FetchParam();
 #pragma warning disable IDE0059 // Remove unnecessary value assignment
-                var instanceCount = FetchParam();
-                var firstIndex = FetchParam();
-                var firstVertex = FetchParam();
-                var firstInstance = FetchParam();
+                FifoWord instanceCount = FetchParam();
+                FifoWord firstIndex = FetchParam();
+                FifoWord firstVertex = FetchParam();
+                FifoWord firstInstance = FetchParam();
 #pragma warning restore IDE0059
 
                 if (i == 0)
@@ -492,7 +492,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.MME
                 }
             }
 
-            var bufferCache = _processor.MemoryManager.Physical.BufferCache;
+            BufferCache 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 var value))
+            if (!Fifo.TryDequeue(out FifoWord value))
             {
                 Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");
 

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)
         {
-            var mc = MemoryMarshal.Cast<int, byte>(code);
+            ReadOnlySpan<byte> mc = MemoryMarshal.Cast<int, byte>(code);
 
             for (int i = 0; i < _table.Length; i++)
             {
-                ref var entry = ref _table[i];
+                ref TableEntry entry = ref _table[i];
 
-                var hash = Hash128.ComputeHash(mc[..entry.Length]);
+                Hash128 hash = Hash128.ComputeHash(mc[..entry.Length]);
                 if (hash == entry.Hash)
                 {
                     if (IsMacroHLESupported(caps, entry.Name))

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 var value))
+            if (!Fifo.TryDequeue(out FifoWord value))
             {
                 Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");
 

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 var value))
+            if (!Fifo.TryDequeue(out FifoWord value))
             {
                 Logger.Warning?.Print(LogClass.Gpu, "Macro attempted to fetch an inexistent argument.");
 

src/Ryujinx.Graphics.Gpu/Engine/Threed/Blender/AdvancedBlendFunctions.cs

@@ -221,7 +221,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.Blender
             sb.AppendLine($"private static Dictionary<Hash128, AdvancedBlendEntry> _entries = new()");
             sb.AppendLine("{");
 
-            foreach (var entry in Table)
+            foreach (AdvancedBlendUcode entry in Table)
             {
                 Hash128 hash = Hash128.ComputeHash(MemoryMarshal.Cast<uint, byte>(entry.Code));
 

src/Ryujinx.Graphics.Gpu/Engine/Threed/Blender/AdvancedBlendManager.cs

@@ -66,7 +66,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.Blender
 
             descriptor = default;
 
-            if (!AdvancedBlendPreGenTable.Entries.TryGetValue(hash, out var entry))
+            if (!AdvancedBlendPreGenTable.Entries.TryGetValue(hash, out AdvancedBlendEntry entry))
             {
                 return false;
             }

src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeContext.cs

@@ -65,7 +65,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
             {
                 if (disposing)
                 {
-                    foreach (var texture in _cache.Values)
+                    foreach (ITexture texture in _cache.Values)
                     {
                         texture.Release();
                     }
@@ -603,7 +603,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                 DestroyIfNotNull(ref _geometryIndexDataBuffer.Handle);
                 DestroyIfNotNull(ref _sequentialIndexBuffer);
 
-                foreach (var indexBuffer in _topologyRemapBuffers.Values)
+                foreach (IndexBuffer indexBuffer in _topologyRemapBuffers.Values)
                 {
                     _context.Renderer.DeleteBuffer(indexBuffer.Handle);
                 }

src/Ryujinx.Graphics.Gpu/Engine/Threed/ComputeDraw/VtgAsComputeState.cs

@@ -127,7 +127,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
 
             for (int index = 0; index < Constants.TotalVertexAttribs; index++)
             {
-                var vertexAttrib = _state.State.VertexAttribState[index];
+                VertexAttribState vertexAttrib = _state.State.VertexAttribState[index];
 
                 if (!FormatTable.TryGetSingleComponentAttribFormat(vertexAttrib.UnpackFormat(), out Format format, out int componentsCount))
                 {
@@ -153,7 +153,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
                 int bufferIndex = vertexAttrib.UnpackBufferIndex();
 
                 GpuVa endAddress = _state.State.VertexBufferEndAddress[bufferIndex];
-                var vertexBuffer = _state.State.VertexBufferState[bufferIndex];
+                VertexBufferState vertexBuffer = _state.State.VertexBufferState[bufferIndex];
                 bool instanced = _state.State.VertexBufferInstanced[bufferIndex];
 
                 ulong address = vertexBuffer.Address.Pack();
@@ -351,7 +351,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
         /// <param name="size">Size of the buffer in bytes</param>
         private readonly void SetBufferTexture(ResourceReservations reservations, int index, Format format, ulong address, ulong size)
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
             BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(memoryManager.GetPhysicalRegions(address, size), BufferStage.VertexBuffer);
 
@@ -392,7 +392,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed.ComputeDraw
             indexOffset <<= shift;
             size <<= shift;
 
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
             ulong misalign = address & ((ulong)_context.Capabilities.TextureBufferOffsetAlignment - 1);
             BufferRange range = memoryManager.Physical.BufferCache.GetBufferRange(

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

@@ -1,3 +1,4 @@
+using Ryujinx.Graphics.Gpu.Memory;
 using System;
 using System.Runtime.InteropServices;
 
@@ -92,7 +93,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (enable)
             {
-                var uniformBuffer = _state.State.UniformBufferState;
+                UniformBufferState uniformBuffer = _state.State.UniformBufferState;
 
                 ulong address = uniformBuffer.Address.Pack();
 
@@ -111,7 +112,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         {
             if (_ubFollowUpAddress != 0)
             {
-                var memoryManager = _channel.MemoryManager;
+                MemoryManager memoryManager = _channel.MemoryManager;
 
                 Span<byte> data = MemoryMarshal.Cast<int, byte>(_ubData.AsSpan(0, (int)(_ubByteCount / 4)));
 
@@ -131,7 +132,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="argument">New uniform buffer data word</param>
         public void Update(int argument)
         {
-            var uniformBuffer = _state.State.UniformBufferState;
+            UniformBufferState uniformBuffer = _state.State.UniformBufferState;
 
             ulong address = uniformBuffer.Address.Pack() + (uint)uniformBuffer.Offset;
 
@@ -157,7 +158,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="data">Data to be written to the uniform buffer</param>
         public void Update(ReadOnlySpan<int> data)
         {
-            var uniformBuffer = _state.State.UniformBufferState;
+            UniformBufferState uniformBuffer = _state.State.UniformBufferState;
 
             ulong address = uniformBuffer.Address.Pack() + (uint)uniformBuffer.Offset;
 

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

@@ -471,7 +471,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             int textureId = _state.State.DrawTextureTextureId;
             int samplerId = _state.State.DrawTextureSamplerId;
 
-            (var texture, var sampler) = _channel.TextureManager.GetGraphicsTextureAndSampler(textureId, samplerId);
+            (Image.Texture texture, Sampler sampler) = _channel.TextureManager.GetGraphicsTextureAndSampler(textureId, samplerId);
 
             srcX0 *= texture.ScaleFactor;
             srcY0 *= texture.ScaleFactor;
@@ -684,8 +684,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (hasCount)
             {
-                var indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange, BufferStage.Indirect);
-                var parameterBuffer = memory.BufferCache.GetBufferRange(parameterBufferRange, BufferStage.Indirect);
+                BufferRange indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange, BufferStage.Indirect);
+                BufferRange parameterBuffer = memory.BufferCache.GetBufferRange(parameterBufferRange, BufferStage.Indirect);
 
                 if (indexed)
                 {
@@ -698,7 +698,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             }
             else
             {
-                var indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange, BufferStage.Indirect);
+                BufferRange indirectBuffer = memory.BufferCache.GetBufferRange(indirectBufferRange, BufferStage.Indirect);
 
                 if (indexed)
                 {
@@ -820,7 +820,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             // If there is a mismatch on the host clip region and the one explicitly defined by the guest
             // on the screen scissor state, then we need to force only one texture to be bound to avoid
             // host clipping.
-            var screenScissorState = _state.State.ScreenScissorState;
+            ScreenScissorState screenScissorState = _state.State.ScreenScissorState;
 
             bool clearAffectedByStencilMask = (_state.State.ClearFlags & 1) != 0;
             bool clearAffectedByScissor = (_state.State.ClearFlags & 0x100) != 0;
@@ -833,7 +833,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
                 if (fullClear && clearAffectedByScissor && _state.State.ScissorState[0].Enable)
                 {
-                    ref var scissorState = ref _state.State.ScissorState[0];
+                    ref ScissorState scissorState = ref _state.State.ScissorState[0];
 
                     fullClear = scissorState.X1 == screenScissorState.X &&
                         scissorState.Y1 == screenScissorState.Y &&
@@ -894,7 +894,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
                 if (clearAffectedByScissor && _state.State.ScissorState[0].Enable)
                 {
-                    ref var scissorState = ref _state.State.ScissorState[0];
+                    ref ScissorState scissorState = ref _state.State.ScissorState[0];
 
                     scissorX = Math.Max(scissorX, scissorState.X1);
                     scissorY = Math.Max(scissorY, scissorState.Y1);
@@ -923,7 +923,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (componentMask != 0)
             {
-                var clearColor = _state.State.ClearColors;
+                ClearColors clearColor = _state.State.ClearColors;
 
                 ColorF color = new(clearColor.Red, clearColor.Green, clearColor.Blue, clearColor.Alpha);
 

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

@@ -288,7 +288,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             {
                 int rtIndex = rtControl.UnpackPermutationIndex(index);
 
-                var colorState = state[rtIndex];
+                RtColorState colorState = state[rtIndex];
 
                 if (index < count && StateUpdater.IsRtEnabled(colorState))
                 {

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

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -58,13 +59,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             _registerToGroupMapping = new byte[BlockSize];
             _callbacks = new Action[entries.Length];
 
-            var fieldToDelegate = new Dictionary<string, int>();
+            Dictionary<string, int> fieldToDelegate = new Dictionary<string, int>();
 
             for (int entryIndex = 0; entryIndex < entries.Length; entryIndex++)
             {
-                var entry = entries[entryIndex];
+                StateUpdateCallbackEntry entry = entries[entryIndex];
 
-                foreach (var fieldName in entry.FieldNames)
+                foreach (string fieldName in entry.FieldNames)
                 {
                     fieldToDelegate.Add(fieldName, entryIndex);
                 }
@@ -72,15 +73,15 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 _callbacks[entryIndex] = entry.Callback;
             }
 
-            var fields = typeof(TState).GetFields();
+            FieldInfo[] fields = typeof(TState).GetFields();
             int offset = 0;
 
             for (int fieldIndex = 0; fieldIndex < fields.Length; fieldIndex++)
             {
-                var field = fields[fieldIndex];
+                FieldInfo field = fields[fieldIndex];
 
-                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 currentFieldOffset = (int)Marshal.OffsetOf<TState>(field.Name);
+                int nextFieldOffset = fieldIndex + 1 == fields.Length ? Unsafe.SizeOf<TState>() : (int)Marshal.OffsetOf<TState>(fields[fieldIndex + 1].Name);
 
                 int sizeOfField = nextFieldOffset - currentFieldOffset;
 

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

@@ -3,6 +3,7 @@ using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine.Threed.Blender;
 using Ryujinx.Graphics.Gpu.Engine.Types;
 using Ryujinx.Graphics.Gpu.Image;
+using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.Shader;
 using Ryujinx.Graphics.Texture;
@@ -463,8 +464,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="singleUse">If this is not -1, it indicates that only the given indexed target will be used.</param>
         public void UpdateRenderTargetState(RenderTargetUpdateFlags updateFlags, int singleUse = -1)
         {
-            var memoryManager = _channel.MemoryManager;
-            var rtControl = _state.State.RtControl;
+            MemoryManager memoryManager = _channel.MemoryManager;
+            RtControl rtControl = _state.State.RtControl;
 
             bool useControl = updateFlags.HasFlag(RenderTargetUpdateFlags.UseControl);
             bool layered = updateFlags.HasFlag(RenderTargetUpdateFlags.Layered);
@@ -473,12 +474,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             int count = useControl ? rtControl.UnpackCount() : Constants.TotalRenderTargets;
 
-            var msaaMode = _state.State.RtMsaaMode;
+            TextureMsaaMode msaaMode = _state.State.RtMsaaMode;
 
             int samplesInX = msaaMode.SamplesInX();
             int samplesInY = msaaMode.SamplesInY();
 
-            var scissor = _state.State.ScreenScissorState;
+            ScreenScissorState scissor = _state.State.ScreenScissorState;
             Size sizeHint = new((scissor.X + scissor.Width) * samplesInX, (scissor.Y + scissor.Height) * samplesInY, 1);
 
             int clipRegionWidth = int.MaxValue;
@@ -491,7 +492,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             {
                 int rtIndex = useControl ? rtControl.UnpackPermutationIndex(index) : index;
 
-                var colorState = _state.State.RtColorState[rtIndex];
+                RtColorState colorState = _state.State.RtColorState[rtIndex];
 
                 if (index >= count || !IsRtEnabled(colorState) || (singleColor && index != singleUse))
                 {
@@ -541,8 +542,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (dsEnable && updateFlags.HasFlag(RenderTargetUpdateFlags.UpdateDepthStencil))
             {
-                var dsState = _state.State.RtDepthStencilState;
-                var dsSize = _state.State.RtDepthStencilSize;
+                RtDepthStencilState dsState = _state.State.RtDepthStencilState;
+                Size3D dsSize = _state.State.RtDepthStencilSize;
 
                 depthStencil = memoryManager.Physical.TextureCache.FindOrCreateTexture(
                     memoryManager,
@@ -643,7 +644,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
                     if (_state.State.YControl.HasFlag(YControl.NegateY))
                     {
-                        ref var screenScissor = ref _state.State.ScreenScissorState;
+                        ref ScreenScissorState screenScissor = ref _state.State.ScreenScissorState;
                         y = screenScissor.Height - height - y;
 
                         if (y < 0)
@@ -721,8 +722,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateViewportTransform()
         {
-            var yControl = _state.State.YControl;
-            var face = _state.State.FaceState;
+            YControl yControl = _state.State.YControl;
+            FaceState face = _state.State.FaceState;
 
             bool disableTransform = _state.State.ViewportTransformEnable == 0;
             bool yNegate = yControl.HasFlag(YControl.NegateY);
@@ -736,17 +737,17 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             {
                 if (disableTransform)
                 {
-                    ref var scissor = ref _state.State.ScreenScissorState;
+                    ref ScreenScissorState scissor = ref _state.State.ScreenScissorState;
 
                     float rScale = _channel.TextureManager.RenderTargetScale;
-                    var scissorRect = new Rectangle<float>(0, 0, (scissor.X + scissor.Width) * rScale, (scissor.Y + scissor.Height) * rScale);
+                    Rectangle<float> scissorRect = new Rectangle<float>(0, 0, (scissor.X + scissor.Width) * rScale, (scissor.Y + scissor.Height) * rScale);
 
                     viewports[index] = new Viewport(scissorRect, ViewportSwizzle.PositiveX, ViewportSwizzle.PositiveY, ViewportSwizzle.PositiveZ, ViewportSwizzle.PositiveW, 0, 1);
                     continue;
                 }
 
-                ref var transform = ref _state.State.ViewportTransform[index];
-                ref var extents = ref _state.State.ViewportExtents[index];
+                ref ViewportTransform transform = ref _state.State.ViewportTransform[index];
+                ref ViewportExtents extents = ref _state.State.ViewportExtents[index];
 
                 float scaleX = MathF.Abs(transform.ScaleX);
                 float scaleY = transform.ScaleY;
@@ -841,7 +842,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateDepthBiasState()
         {
-            var depthBias = _state.State.DepthBiasState;
+            DepthBiasState depthBias = _state.State.DepthBiasState;
 
             float factor = _state.State.DepthBiasFactor;
             float units = _state.State.DepthBiasUnits;
@@ -862,9 +863,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateStencilTestState()
         {
-            var backMasks = _state.State.StencilBackMasks;
-            var test = _state.State.StencilTestState;
-            var backTest = _state.State.StencilBackTestState;
+            StencilBackMasks backMasks = _state.State.StencilBackMasks;
+            StencilTestState test = _state.State.StencilTestState;
+            StencilBackTestState backTest = _state.State.StencilBackTestState;
 
             CompareOp backFunc;
             StencilOp backSFail;
@@ -934,10 +935,10 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateSamplerPoolState()
         {
-            var texturePool = _state.State.TexturePoolState;
-            var samplerPool = _state.State.SamplerPoolState;
+            PoolState texturePool = _state.State.TexturePoolState;
+            PoolState samplerPool = _state.State.SamplerPoolState;
 
-            var samplerIndex = _state.State.SamplerIndex;
+            SamplerIndex samplerIndex = _state.State.SamplerIndex;
 
             int maximumId = samplerIndex == SamplerIndex.ViaHeaderIndex
                 ? texturePool.MaximumId
@@ -951,7 +952,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateTexturePoolState()
         {
-            var texturePool = _state.State.TexturePoolState;
+            PoolState texturePool = _state.State.TexturePoolState;
 
             _channel.TextureManager.SetGraphicsTexturePool(texturePool.Address.Pack(), texturePool.MaximumId);
             _channel.TextureManager.SetGraphicsTextureBufferIndex((int)_state.State.TextureBufferIndex);
@@ -971,7 +972,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             for (int index = 0; index < Constants.TotalVertexAttribs; index++)
             {
-                var vertexAttrib = _state.State.VertexAttribState[index];
+                VertexAttribState vertexAttrib = _state.State.VertexAttribState[index];
 
                 int bufferIndex = vertexAttrib.UnpackBufferIndex();
 
@@ -1065,7 +1066,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateIndexBufferState()
         {
-            var indexBuffer = _state.State.IndexBufferState;
+            IndexBufferState indexBuffer = _state.State.IndexBufferState;
 
             if (_drawState.IndexCount == 0)
             {
@@ -1109,7 +1110,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             for (int index = 0; index < Constants.TotalVertexBuffers; index++)
             {
-                var vertexBuffer = _state.State.VertexBufferState[index];
+                VertexBufferState vertexBuffer = _state.State.VertexBufferState[index];
 
                 if (!vertexBuffer.UnpackEnable())
                 {
@@ -1193,8 +1194,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateFaceState()
         {
-            var yControl = _state.State.YControl;
-            var face = _state.State.FaceState;
+            YControl yControl = _state.State.YControl;
+            FaceState face = _state.State.FaceState;
 
             _pipeline.CullEnable = face.CullEnable;
             _pipeline.CullMode = face.CullFace;
@@ -1233,7 +1234,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             for (int index = 0; index < Constants.TotalRenderTargets; index++)
             {
-                var colorMask = _state.State.RtColorMask[rtColorMaskShared ? 0 : index];
+                RtColorMask colorMask = _state.State.RtColorMask[rtColorMaskShared ? 0 : index];
 
                 uint componentMask;
 
@@ -1256,7 +1257,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         {
             if (_state.State.BlendUcodeEnable != BlendUcodeEnable.Disabled)
             {
-                if (_context.Capabilities.SupportsBlendEquationAdvanced && _blendManager.TryGetAdvancedBlend(out var blendDescriptor))
+                if (_context.Capabilities.SupportsBlendEquationAdvanced && _blendManager.TryGetAdvancedBlend(out AdvancedBlendDescriptor blendDescriptor))
                 {
                     // Try to HLE it using advanced blend on the host if we can.
                     _context.Renderer.Pipeline.SetBlendState(blendDescriptor);
@@ -1278,9 +1279,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 for (int index = 0; index < Constants.TotalRenderTargets; index++)
                 {
                     bool enable = _state.State.BlendEnable[index];
-                    var blend = _state.State.BlendState[index];
+                    BlendState blend = _state.State.BlendState[index];
 
-                    var descriptor = new BlendDescriptor(
+                    BlendDescriptor descriptor = new BlendDescriptor(
                         enable,
                         blendConstant,
                         blend.ColorOp,
@@ -1306,9 +1307,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             else
             {
                 bool enable = _state.State.BlendEnable[0];
-                var blend = _state.State.BlendStateCommon;
+                BlendStateCommon blend = _state.State.BlendStateCommon;
 
-                var descriptor = new BlendDescriptor(
+                BlendDescriptor descriptor = new BlendDescriptor(
                     enable,
                     blendConstant,
                     blend.ColorOp,
@@ -1409,7 +1410,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateShaderState()
         {
-            var shaderCache = _channel.MemoryManager.Physical.ShaderCache;
+            ShaderCache shaderCache = _channel.MemoryManager.Physical.ShaderCache;
 
             _vtgWritesRtLayer = false;
 
@@ -1420,7 +1421,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             for (int index = 0; index < 6; index++)
             {
-                var shader = _state.State.ShaderState[index];
+                ShaderState shader = _state.State.ShaderState[index];
                 if (!shader.UnpackEnable() && index != 1)
                 {
                     continue;
@@ -1525,7 +1526,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         private void UpdateSupportBufferViewportSize()
         {
-            ref var transform = ref _state.State.ViewportTransform[0];
+            ref ViewportTransform transform = ref _state.State.ViewportTransform[0];
 
             float scaleX = MathF.Abs(transform.ScaleX);
             float scaleY = transform.ScaleY;
@@ -1564,8 +1565,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <returns>Current depth mode</returns>
         private DepthMode GetDepthMode()
         {
-            ref var transform = ref _state.State.ViewportTransform[0];
-            ref var extents = ref _state.State.ViewportExtents[0];
+            ref ViewportTransform transform = ref _state.State.ViewportTransform[0];
+            ref ViewportExtents extents = ref _state.State.ViewportExtents[0];
 
             DepthMode depthMode;
 

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

@@ -82,8 +82,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             _i2mClass = new InlineToMemoryClass(context, channel, initializeState: false);
 
-            var spec = new SpecializationStateUpdater(context);
-            var drawState = new DrawState();
+            SpecializationStateUpdater spec = new SpecializationStateUpdater(context);
+            DrawState drawState = new DrawState();
 
             _drawManager = new DrawManager(context, channel, _state, drawState, spec);
             _blendManager = new AdvancedBlendManager(_state);
@@ -253,8 +253,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             }
             else
             {
-                ref var lhsVec = ref Unsafe.As<T, Vector128<uint>>(ref lhs);
-                ref var rhsVec = ref Unsafe.As<T, Vector128<uint>>(ref rhs);
+                ref Vector128<uint> lhsVec = ref Unsafe.As<T, Vector128<uint>>(ref lhs);
+                ref Vector128<uint> rhsVec = ref Unsafe.As<T, Vector128<uint>>(ref rhs);
 
                 return Vector128.EqualsAll(lhsVec, rhsVec) &&
                     Vector128.EqualsAll(Unsafe.Add(ref lhsVec, 1), Unsafe.Add(ref rhsVec, 1));
@@ -267,8 +267,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="masks">Blend enable</param>
         public void UpdateBlendEnable(ref Array8<Boolean32> enable)
         {
-            var shadow = ShadowMode;
-            ref var state = ref _state.State.BlendEnable;
+            SetMmeShadowRamControlMode shadow = ShadowMode;
+            ref Array8<Boolean32> state = ref _state.State.BlendEnable;
 
             if (shadow.IsReplay())
             {
@@ -294,8 +294,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="masks">Color masks</param>
         public void UpdateColorMasks(ref Array8<RtColorMask> masks)
         {
-            var shadow = ShadowMode;
-            ref var state = ref _state.State.RtColorMask;
+            SetMmeShadowRamControlMode shadow = ShadowMode;
+            ref Array8<RtColorMask> state = ref _state.State.RtColorMask;
 
             if (shadow.IsReplay())
             {
@@ -323,12 +323,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="type">Type of the binding</param>
         public void UpdateIndexBuffer(uint addrHigh, uint addrLow, IndexType type)
         {
-            var shadow = ShadowMode;
-            ref var state = ref _state.State.IndexBufferState;
+            SetMmeShadowRamControlMode shadow = ShadowMode;
+            ref IndexBufferState state = ref _state.State.IndexBufferState;
 
             if (shadow.IsReplay())
             {
-                ref var shadowState = ref _state.ShadowState.IndexBufferState;
+                ref IndexBufferState shadowState = ref _state.ShadowState.IndexBufferState;
                 addrHigh = shadowState.Address.High;
                 addrLow = shadowState.Address.Low;
                 type = shadowState.Type;
@@ -345,7 +345,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (shadow.IsTrack())
             {
-                ref var shadowState = ref _state.ShadowState.IndexBufferState;
+                ref IndexBufferState shadowState = ref _state.ShadowState.IndexBufferState;
                 shadowState.Address.High = addrHigh;
                 shadowState.Address.Low = addrLow;
                 shadowState.Type = type;
@@ -360,12 +360,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="addrLow">Low part of the address</param>
         public void UpdateUniformBufferState(int size, uint addrHigh, uint addrLow)
         {
-            var shadow = ShadowMode;
-            ref var state = ref _state.State.UniformBufferState;
+            SetMmeShadowRamControlMode shadow = ShadowMode;
+            ref UniformBufferState state = ref _state.State.UniformBufferState;
 
             if (shadow.IsReplay())
             {
-                ref var shadowState = ref _state.ShadowState.UniformBufferState;
+                ref UniformBufferState shadowState = ref _state.ShadowState.UniformBufferState;
                 size = shadowState.Size;
                 addrHigh = shadowState.Address.High;
                 addrLow = shadowState.Address.Low;
@@ -377,7 +377,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             if (shadow.IsTrack())
             {
-                ref var shadowState = ref _state.ShadowState.UniformBufferState;
+                ref UniformBufferState shadowState = ref _state.ShadowState.UniformBufferState;
                 shadowState.Size = size;
                 shadowState.Address.High = addrHigh;
                 shadowState.Address.Low = addrLow;
@@ -391,8 +391,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="offset">Offset to update with</param>
         public void SetShaderOffset(int index, uint offset)
         {
-            var shadow = ShadowMode;
-            ref var shaderState = ref _state.State.ShaderState[index];
+            SetMmeShadowRamControlMode shadow = ShadowMode;
+            ref ShaderState shaderState = ref _state.State.ShaderState[index];
 
             if (shadow.IsReplay())
             {
@@ -418,8 +418,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="ubState">Uniform buffer state</param>
         public void UpdateUniformBufferState(UniformBufferState ubState)
         {
-            var shadow = ShadowMode;
-            ref var state = ref _state.State.UniformBufferState;
+            SetMmeShadowRamControlMode shadow = ShadowMode;
+            ref UniformBufferState state = ref _state.State.UniformBufferState;
 
             if (shadow.IsReplay())
             {

src/Ryujinx.Graphics.Gpu/Engine/Twod/TwodClass.cs

@@ -3,6 +3,7 @@ using Ryujinx.Graphics.Device;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Engine.Types;
 using Ryujinx.Graphics.Gpu.Image;
+using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Graphics.Texture;
 using Ryujinx.Memory;
 using System;
@@ -123,7 +124,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
         /// <param name="bpp">Bytes per pixel</param>
         private void UnscaledFullCopy(TwodTexture src, TwodTexture dst, int w, int h, int bpp)
         {
-            var srcCalculator = new OffsetCalculator(
+            OffsetCalculator srcCalculator = new OffsetCalculator(
                 w,
                 h,
                 src.Stride,
@@ -134,7 +135,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
 
             (int _, int srcSize) = srcCalculator.GetRectangleRange(0, 0, w, h);
 
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
             ulong srcGpuVa = src.Address.Pack();
             ulong dstGpuVa = dst.Address.Pack();
@@ -228,10 +229,10 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
         /// <param name="argument">Method call argument</param>
         private void PixelsFromMemorySrcY0Int(int argument)
         {
-            var memoryManager = _channel.MemoryManager;
+            MemoryManager memoryManager = _channel.MemoryManager;
 
-            var dstCopyTexture = Unsafe.As<uint, TwodTexture>(ref _state.State.SetDstFormat);
-            var srcCopyTexture = Unsafe.As<uint, TwodTexture>(ref _state.State.SetSrcFormat);
+            TwodTexture dstCopyTexture = Unsafe.As<uint, TwodTexture>(ref _state.State.SetDstFormat);
+            TwodTexture srcCopyTexture = Unsafe.As<uint, TwodTexture>(ref _state.State.SetSrcFormat);
 
             long srcX = ((long)_state.State.SetPixelsFromMemorySrcX0Int << 32) | (long)(ulong)_state.State.SetPixelsFromMemorySrcX0Frac;
             long srcY = ((long)_state.State.PixelsFromMemorySrcY0Int << 32) | (long)(ulong)_state.State.SetPixelsFromMemorySrcY0Frac;
@@ -268,10 +269,10 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
 
             // The source and destination textures should at least be as big as the region being requested.
             // The hints will only resize within alignment constraints, so out of bound copies won't resize in most cases.
-            var srcHint = new Size(srcX2, srcY2, 1);
-            var dstHint = new Size(dstX2, dstY2, 1);
+            Size srcHint = new Size(srcX2, srcY2, 1);
+            Size dstHint = new Size(dstX2, dstY2, 1);
 
-            var srcCopyTextureFormat = srcCopyTexture.Format.Convert();
+            FormatInfo srcCopyTextureFormat = srcCopyTexture.Format.Convert();
 
             int srcWidthAligned = srcCopyTexture.Stride / srcCopyTextureFormat.BytesPerPixel;
 
@@ -304,7 +305,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
             // are the same, as we can't blit between different depth formats.
             bool srcDepthAlias = srcCopyTexture.Format == dstCopyTexture.Format;
 
-            var srcTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
+            Image.Texture srcTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
                 memoryManager,
                 srcCopyTexture,
                 offset,
@@ -341,7 +342,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Twod
                 dstCopyTextureFormat = dstCopyTexture.Format.Convert();
             }
 
-            var dstTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
+            Image.Texture dstTexture = memoryManager.Physical.TextureCache.FindOrCreateTexture(
                 memoryManager,
                 dstCopyTexture,
                 0,

src/Ryujinx.Graphics.Gpu/GpuChannel.cs

@@ -57,7 +57,7 @@ namespace Ryujinx.Graphics.Gpu
         /// <param name="memoryManager">The new memory manager to be bound</param>
         public void BindMemory(MemoryManager memoryManager)
         {
-            var oldMemoryManager = Interlocked.Exchange(ref _memoryManager, memoryManager ?? throw new ArgumentNullException(nameof(memoryManager)));
+            MemoryManager oldMemoryManager = Interlocked.Exchange(ref _memoryManager, memoryManager ?? throw new ArgumentNullException(nameof(memoryManager)));
 
             memoryManager.Physical.IncrementReferenceCount();
 
@@ -85,7 +85,7 @@ namespace Ryujinx.Graphics.Gpu
         {
             TextureManager.ReloadPools();
 
-            var memoryManager = Volatile.Read(ref _memoryManager);
+            MemoryManager memoryManager = Volatile.Read(ref _memoryManager);
             memoryManager?.Physical.BufferCache.QueuePrune();
         }
 
@@ -138,7 +138,7 @@ namespace Ryujinx.Graphics.Gpu
             _processor.Dispose();
             TextureManager.Dispose();
 
-            var oldMemoryManager = Interlocked.Exchange(ref _memoryManager, null);
+            MemoryManager oldMemoryManager = Interlocked.Exchange(ref _memoryManager, null);
             if (oldMemoryManager != null)
             {
                 oldMemoryManager.Physical.BufferCache.NotifyBuffersModified -= BufferManager.Rebind;