diff --git a/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs b/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
index 34f52d6ab..63cc63fec 100644
--- a/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
+++ b/src/Ryujinx.Common/Logging/Targets/AsyncLogTargetWrapper.cs
@@ -94,7 +94,7 @@ namespace Ryujinx.Common.Logging.Targets
return;
}
- using var signal = new ManualResetEventSlim(false);
+ using ManualResetEventSlim signal = new ManualResetEventSlim(false);
try
{
_messageQueue.Add(new FlushEventArgs(signal));
diff --git a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
index dd0f45651..f4a2fac17 100644
--- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
@@ -205,7 +205,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
GpuChannelComputeState computeState,
ulong gpuVa)
{
- if (_cpPrograms.TryGetValue(gpuVa, out var cpShader) && IsShaderEqual(channel, poolState, computeState, cpShader, gpuVa))
+ if (_cpPrograms.TryGetValue(gpuVa, out CachedShaderProgram cpShader) && IsShaderEqual(channel, poolState, computeState, cpShader, gpuVa))
{
return cpShader;
}
@@ -252,8 +252,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
{
channel.TextureManager.UpdateRenderTargets();
- var rtControl = state.RtControl;
- var msaaMode = state.RtMsaaMode;
+ RtControl rtControl = state.RtControl;
+ TextureMsaaMode msaaMode = state.RtMsaaMode;
pipeline.SamplesCount = msaaMode.SamplesInX() * msaaMode.SamplesInY();
@@ -267,7 +267,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
{
int rtIndex = rtControl.UnpackPermutationIndex(index);
- var colorState = rtColorStateSpan[rtIndex];
+ RtColorState colorState = rtColorStateSpan[rtIndex];
if (index >= count || colorState.Format == 0 || colorState.WidthOrStride == 0)
{
@@ -312,12 +312,12 @@ namespace Ryujinx.Graphics.Gpu.Shader
ref GpuChannelGraphicsState graphicsState,
ShaderAddresses addresses)
{
- if (_gpPrograms.TryGetValue(addresses, out var gpShaders) && IsShaderEqual(channel, ref poolState, ref graphicsState, gpShaders, addresses))
+ if (_gpPrograms.TryGetValue(addresses, out CachedShaderProgram gpShaders) && IsShaderEqual(channel, ref poolState, ref graphicsState, gpShaders, addresses))
{
return gpShaders;
}
- if (_graphicsShaderCache.TryFind(channel, ref poolState, ref graphicsState, addresses, out gpShaders, out var cachedGuestCode))
+ if (_graphicsShaderCache.TryFind(channel, ref poolState, ref graphicsState, addresses, out gpShaders, out CachedGraphicsGuestCode cachedGuestCode))
{
_gpPrograms[addresses] = gpShaders;
return gpShaders;
@@ -590,7 +590,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
for (int i = 0; i < Constants.TotalTransformFeedbackBuffers; i++)
{
- var tf = tfStateSpan[i];
+ TfState tf = tfStateSpan[i];
descs[i] = new TransformFeedbackDescriptor(
tf.BufferIndex,
@@ -696,7 +696,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// The generated translator context
public static TranslatorContext DecodeComputeShader(IGpuAccessor gpuAccessor, TargetApi api, ulong gpuVa)
{
- var options = CreateTranslationOptions(api, DefaultFlags | TranslationFlags.Compute);
+ TranslationOptions options = CreateTranslationOptions(api, DefaultFlags | TranslationFlags.Compute);
return Translator.CreateContext(gpuVa, gpuAccessor, options);
}
@@ -713,7 +713,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// The generated translator context
public static TranslatorContext DecodeGraphicsShader(IGpuAccessor gpuAccessor, TargetApi api, TranslationFlags flags, ulong gpuVa)
{
- var options = CreateTranslationOptions(api, flags);
+ TranslationOptions options = CreateTranslationOptions(api, flags);
return Translator.CreateContext(gpuVa, gpuAccessor, options);
}
@@ -739,7 +739,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
{
ulong cb1DataAddress = channel.BufferManager.GetGraphicsUniformBufferAddress(0, 1);
- var memoryManager = channel.MemoryManager;
+ MemoryManager memoryManager = channel.MemoryManager;
codeA ??= memoryManager.GetSpan(vertexA.Address, vertexA.Size).ToArray();
codeB ??= memoryManager.GetSpan(currentStage.Address, currentStage.Size).ToArray();
@@ -777,7 +777,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// Compiled graphics shader code
private static TranslatedShader TranslateShader(ShaderDumper dumper, GpuChannel channel, TranslatorContext context, byte[] code, bool asCompute)
{
- var memoryManager = channel.MemoryManager;
+ MemoryManager memoryManager = channel.MemoryManager;
ulong cb1DataAddress = context.Stage == ShaderStage.Compute
? channel.BufferManager.GetComputeUniformBufferAddress(1)
diff --git a/src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs b/src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs
index 94691a5b4..2d366be71 100644
--- a/src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs
+++ b/src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs
@@ -93,7 +93,7 @@ namespace Ryujinx.Graphics.Shader.Translation
size = DefaultLocalMemorySize;
}
- var lmem = new MemoryDefinition("local_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
+ MemoryDefinition lmem = new MemoryDefinition("local_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
LocalMemoryId = Properties.AddLocalMemory(lmem);
}
@@ -112,7 +112,7 @@ namespace Ryujinx.Graphics.Shader.Translation
size = DefaultSharedMemorySize;
}
- var smem = new MemoryDefinition("shared_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
+ MemoryDefinition smem = new MemoryDefinition("shared_memory", AggregateType.Array | AggregateType.U32, BitUtils.DivRoundUp(size, sizeof(uint)));
SharedMemoryId = Properties.AddSharedMemory(smem);
}
@@ -273,16 +273,16 @@ namespace Ryujinx.Graphics.Shader.Translation
bool coherent,
bool separate)
{
- var dimensions = type == SamplerType.None ? 0 : type.GetDimensions();
- var dict = isImage ? _usedImages : _usedTextures;
+ int dimensions = type == SamplerType.None ? 0 : type.GetDimensions();
+ Dictionary dict = isImage ? _usedImages : _usedTextures;
- var usageFlags = TextureUsageFlags.None;
+ TextureUsageFlags usageFlags = TextureUsageFlags.None;
if (intCoords)
{
usageFlags |= TextureUsageFlags.NeedsScaleValue;
- var canScale = _stage.SupportsRenderScale() && arrayLength == 1 && !write && dimensions == 2;
+ bool canScale = _stage.SupportsRenderScale() && arrayLength == 1 && !write && dimensions == 2;
if (!canScale)
{
@@ -304,9 +304,9 @@ namespace Ryujinx.Graphics.Shader.Translation
// For array textures, we also want to use type as key,
// since we may have texture handles stores in the same buffer, but for textures with different types.
- var keyType = arrayLength > 1 ? type : SamplerType.None;
- var info = new TextureInfo(cbufSlot, handle, arrayLength, separate, keyType, format);
- var meta = new TextureMeta()
+ SamplerType keyType = arrayLength > 1 ? type : SamplerType.None;
+ TextureInfo info = new TextureInfo(cbufSlot, handle, arrayLength, separate, keyType, format);
+ TextureMeta meta = new TextureMeta()
{
AccurateType = accurateType,
Type = type,
@@ -316,7 +316,7 @@ namespace Ryujinx.Graphics.Shader.Translation
int setIndex;
int binding;
- if (dict.TryGetValue(info, out var existingMeta))
+ if (dict.TryGetValue(info, out TextureMeta existingMeta))
{
dict[info] = MergeTextureMeta(meta, existingMeta);
setIndex = existingMeta.Set;
@@ -373,7 +373,7 @@ namespace Ryujinx.Graphics.Shader.Translation
nameSuffix = cbufSlot < 0 ? $"{prefix}_tcb_{handle:X}" : $"{prefix}_cb{cbufSlot}_{handle:X}";
}
- var definition = new TextureDefinition(
+ TextureDefinition definition = new TextureDefinition(
setIndex,
binding,
arrayLength,
@@ -433,8 +433,8 @@ namespace Ryujinx.Graphics.Shader.Translation
{
selectedMeta.UsageFlags |= TextureUsageFlags.NeedsScaleValue;
- var dimensions = type.GetDimensions();
- var canScale = _stage.SupportsRenderScale() && selectedInfo.ArrayLength == 1 && dimensions == 2;
+ int dimensions = type.GetDimensions();
+ bool canScale = _stage.SupportsRenderScale() && selectedInfo.ArrayLength == 1 && dimensions == 2;
if (!canScale)
{
@@ -454,7 +454,7 @@ namespace Ryujinx.Graphics.Shader.Translation
public BufferDescriptor[] GetConstantBufferDescriptors()
{
- var descriptors = new BufferDescriptor[_usedConstantBufferBindings.Count];
+ BufferDescriptor[] descriptors = new BufferDescriptor[_usedConstantBufferBindings.Count];
int descriptorIndex = 0;
@@ -478,7 +478,7 @@ namespace Ryujinx.Graphics.Shader.Translation
public BufferDescriptor[] GetStorageBufferDescriptors()
{
- var descriptors = new BufferDescriptor[_sbSlots.Count];
+ BufferDescriptor[] descriptors = new BufferDescriptor[_sbSlots.Count];
int descriptorIndex = 0;
diff --git a/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs b/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
index dd1325f8a..e1ca22610 100644
--- a/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
+++ b/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
@@ -242,8 +242,8 @@ namespace Ryujinx.Graphics.Shader.Translation
usedFeatures |= FeatureFlags.VtgAsCompute;
}
- var cfgs = new ControlFlowGraph[functions.Length];
- var frus = new RegisterUsage.FunctionRegisterUsage[functions.Length];
+ ControlFlowGraph[] cfgs = new ControlFlowGraph[functions.Length];
+ RegisterUsage.FunctionRegisterUsage[] frus = new RegisterUsage.FunctionRegisterUsage[functions.Length];
for (int i = 0; i < functions.Length; i++)
{
@@ -266,14 +266,14 @@ namespace Ryujinx.Graphics.Shader.Translation
for (int i = 0; i < functions.Length; i++)
{
- var cfg = cfgs[i];
+ ControlFlowGraph cfg = cfgs[i];
int inArgumentsCount = 0;
int outArgumentsCount = 0;
if (i != 0)
{
- var fru = frus[i];
+ RegisterUsage.FunctionRegisterUsage fru = frus[i];
inArgumentsCount = fru.InArguments.Length;
outArgumentsCount = fru.OutArguments.Length;
@@ -325,7 +325,7 @@ namespace Ryujinx.Graphics.Shader.Translation
FeatureFlags usedFeatures,
byte clipDistancesWritten)
{
- var sInfo = StructuredProgram.MakeStructuredProgram(
+ StructuredProgramInfo sInfo = StructuredProgram.MakeStructuredProgram(
funcs,
attributeUsage,
definitions,
@@ -340,7 +340,7 @@ namespace Ryujinx.Graphics.Shader.Translation
_ => 1
};
- var info = new ShaderProgramInfo(
+ ShaderProgramInfo info = new ShaderProgramInfo(
resourceManager.GetConstantBufferDescriptors(),
resourceManager.GetStorageBufferDescriptors(),
resourceManager.GetTextureDescriptors(),
@@ -356,7 +356,7 @@ namespace Ryujinx.Graphics.Shader.Translation
clipDistancesWritten,
originalDefinitions.OmapTargets);
- var hostCapabilities = new HostCapabilities(
+ HostCapabilities hostCapabilities = new HostCapabilities(
GpuAccessor.QueryHostReducedPrecision(),
GpuAccessor.QueryHostSupportsFragmentShaderInterlock(),
GpuAccessor.QueryHostSupportsFragmentShaderOrderingIntel(),
@@ -367,7 +367,7 @@ namespace Ryujinx.Graphics.Shader.Translation
GpuAccessor.QueryHostSupportsTextureShadowLod(),
GpuAccessor.QueryHostSupportsViewportMask());
- var parameters = new CodeGenParameters(attributeUsage, definitions, resourceManager.Properties, hostCapabilities, GpuAccessor, Options.TargetApi);
+ CodeGenParameters parameters = new CodeGenParameters(attributeUsage, definitions, resourceManager.Properties, hostCapabilities, GpuAccessor, Options.TargetApi);
return Options.TargetLanguage switch
{
@@ -486,10 +486,10 @@ namespace Ryujinx.Graphics.Shader.Translation
public ShaderProgram GenerateVertexPassthroughForCompute()
{
- var attributeUsage = new AttributeUsage(GpuAccessor);
- var resourceManager = new ResourceManager(ShaderStage.Vertex, GpuAccessor);
+ AttributeUsage attributeUsage = new AttributeUsage(GpuAccessor);
+ ResourceManager resourceManager = new ResourceManager(ShaderStage.Vertex, GpuAccessor);
- var reservations = GetResourceReservations();
+ ResourceReservations reservations = GetResourceReservations();
int vertexInfoCbBinding = reservations.VertexInfoConstantBufferBinding;
@@ -508,7 +508,7 @@ namespace Ryujinx.Graphics.Shader.Translation
BufferDefinition vertexOutputBuffer = new(BufferLayout.Std430, 1, vertexDataSbBinding, "vb_input", vertexInputStruct);
resourceManager.Properties.AddOrUpdateStorageBuffer(vertexOutputBuffer);
- var context = new EmitterContext();
+ EmitterContext context = new EmitterContext();
Operand vertexIndex = Options.TargetApi == TargetApi.OpenGL
? context.Load(StorageKind.Input, IoVariable.VertexId)
@@ -553,13 +553,13 @@ namespace Ryujinx.Graphics.Shader.Translation
}
}
- var operations = context.GetOperations();
- var cfg = ControlFlowGraph.Create(operations);
- var function = new Function(cfg.Blocks, "main", false, 0, 0);
+ Operation[] operations = context.GetOperations();
+ ControlFlowGraph cfg = ControlFlowGraph.Create(operations);
+ Function function = new Function(cfg.Blocks, "main", false, 0, 0);
- var transformFeedbackOutputs = GetTransformFeedbackOutputs(GpuAccessor, out ulong transformFeedbackVecMap);
+ TransformFeedbackOutput[] transformFeedbackOutputs = GetTransformFeedbackOutputs(GpuAccessor, out ulong transformFeedbackVecMap);
- var definitions = new ShaderDefinitions(ShaderStage.Vertex, transformFeedbackVecMap, transformFeedbackOutputs)
+ ShaderDefinitions definitions = new ShaderDefinitions(ShaderStage.Vertex, transformFeedbackVecMap, transformFeedbackOutputs)
{
LastInVertexPipeline = true
};
@@ -604,10 +604,10 @@ namespace Ryujinx.Graphics.Shader.Translation
break;
}
- var attributeUsage = new AttributeUsage(GpuAccessor);
- var resourceManager = new ResourceManager(ShaderStage.Geometry, GpuAccessor);
+ AttributeUsage attributeUsage = new AttributeUsage(GpuAccessor);
+ ResourceManager resourceManager = new ResourceManager(ShaderStage.Geometry, GpuAccessor);
- var context = new EmitterContext();
+ EmitterContext context = new EmitterContext();
for (int v = 0; v < maxOutputVertices; v++)
{
@@ -648,11 +648,11 @@ namespace Ryujinx.Graphics.Shader.Translation
context.EndPrimitive();
- var operations = context.GetOperations();
- var cfg = ControlFlowGraph.Create(operations);
- var function = new Function(cfg.Blocks, "main", false, 0, 0);
+ Operation[] operations = context.GetOperations();
+ ControlFlowGraph cfg = ControlFlowGraph.Create(operations);
+ Function function = new Function(cfg.Blocks, "main", false, 0, 0);
- var definitions = new ShaderDefinitions(
+ ShaderDefinitions definitions = new ShaderDefinitions(
ShaderStage.Geometry,
GpuAccessor.QueryGraphicsState(),
false,
diff --git a/src/Ryujinx.Graphics.Vulkan/HelperShader.cs b/src/Ryujinx.Graphics.Vulkan/HelperShader.cs
index 695046198..c75561690 100644
--- a/src/Ryujinx.Graphics.Vulkan/HelperShader.cs
+++ b/src/Ryujinx.Graphics.Vulkan/HelperShader.cs
@@ -904,8 +904,8 @@ namespace Ryujinx.Graphics.Vulkan
pattern.OffsetIndex.CopyTo(shaderParams[..pattern.OffsetIndex.Length]);
- using var patternScoped = gd.BufferManager.ReserveOrCreate(gd, cbs, ParamsBufferSize);
- var patternBuffer = patternScoped.Holder;
+ using ScopedTemporaryBuffer patternScoped = gd.BufferManager.ReserveOrCreate(gd, cbs, ParamsBufferSize);
+ BufferHolder patternBuffer = patternScoped.Holder;
patternBuffer.SetDataUnchecked(patternScoped.Offset, shaderParams);
diff --git a/src/Ryujinx.HLE/Debugger/BreakpointManager.cs b/src/Ryujinx.HLE/Debugger/BreakpointManager.cs
index 4b212be7f..616f959d2 100644
--- a/src/Ryujinx.HLE/Debugger/BreakpointManager.cs
+++ b/src/Ryujinx.HLE/Debugger/BreakpointManager.cs
@@ -1,6 +1,7 @@
using Ryujinx.Common.Logging;
using Ryujinx.Memory;
using System.Collections.Concurrent;
+using System.Collections.Generic;
namespace Ryujinx.HLE.Debugger
{
@@ -52,7 +53,7 @@ namespace Ryujinx.HLE.Debugger
return false;
}
- var originalInstruction = new byte[length];
+ byte[] originalInstruction = new byte[length];
if (!ReadMemory(address, originalInstruction))
{
Logger.Error?.Print(LogClass.GdbStub, $"Failed to read memory at 0x{address:X16} to set breakpoint.");
@@ -65,7 +66,7 @@ namespace Ryujinx.HLE.Debugger
return false;
}
- var breakpoint = new Breakpoint(originalInstruction);
+ Breakpoint breakpoint = new(originalInstruction);
if (_breakpoints.TryAdd(address, breakpoint))
{
Logger.Debug?.Print(LogClass.GdbStub, $"Breakpoint set at 0x{address:X16}");
@@ -106,7 +107,7 @@ namespace Ryujinx.HLE.Debugger
///
public void ClearAll()
{
- foreach (var bp in _breakpoints)
+ foreach (KeyValuePair bp in _breakpoints)
{
if (!WriteMemory(bp.Key, bp.Value.OriginalData))
{
diff --git a/src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs b/src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
index 302969011..ef1d7f394 100644
--- a/src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
@@ -1,5 +1,6 @@
using Ryujinx.Common.Logging;
using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.HLE.HOS.Kernel.Threading;
using System;
using System.Text;
@@ -25,11 +26,11 @@ namespace Ryujinx.HLE.Debugger
public string GetMinidump()
{
- var response = new StringBuilder();
+ StringBuilder response = new();
response.AppendLine("=== Begin Minidump ===\n");
response.AppendLine(GetProcessInfo());
- foreach (var thread in GetThreads())
+ foreach (KThread thread in GetThreads())
{
response.AppendLine($"=== Thread {thread.ThreadUid} ===");
try
@@ -66,7 +67,7 @@ namespace Ryujinx.HLE.Debugger
if (Process is not { } kProcess)
return "No application process found\n";
- var sb = new StringBuilder();
+ StringBuilder sb = new();
sb.AppendLine($"Program Id: 0x{kProcess.TitleId:x16}");
sb.AppendLine($"Application: {(kProcess.IsApplication ? 1 : 0)}");
@@ -81,7 +82,7 @@ namespace Ryujinx.HLE.Debugger
$" Stack: 0x{kProcess.MemoryManager.StackRegionStart:x10} - 0x{kProcess.MemoryManager.StackRegionEnd - 1:x10}");
sb.AppendLine("Modules:");
- var debugger = kProcess.Debugger;
+ HleProcessDebugger debugger = kProcess.Debugger;
if (debugger != null)
{
foreach (HleProcessDebugger.Image image in debugger.GetLoadedImages())
diff --git a/src/Ryujinx.HLE/Debugger/Gdb/Commands.cs b/src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
index 9093440eb..0220e259f 100644
--- a/src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
+++ b/src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
@@ -194,7 +194,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
{
try
{
- var data = new byte[len];
+ byte[] data = new byte[len];
Debugger.DebugProcess.CpuMemory.Read(addr, data);
Processor.Reply(Helpers.ToHex(data));
}
@@ -211,7 +211,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
{
try
{
- var data = new byte[len];
+ byte[] data = new byte[len];
for (ulong i = 0; i < len; i++)
{
data[i] = (byte)ss.ReadLengthAsHex(2);
diff --git a/src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs b/src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
index 31360167f..2e14f2a40 100644
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
@@ -267,7 +267,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
{
moduleName = string.Empty;
- var rodataStart = image.BaseAddress + image.Size;
+ ulong rodataStart = image.BaseAddress + image.Size;
KMemoryInfo roInfo = _owner.MemoryManager.QueryMemory(rodataStart);
if (roInfo.Permission != KMemoryPermission.Read)
@@ -275,7 +275,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
return false;
}
- var rwdataStart = roInfo.Address + roInfo.Size;
+ ulong rwdataStart = roInfo.Address + roInfo.Size;
try
{
@@ -305,7 +305,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
}
pathLength = Math.Min(pathLength, rodataBuf.Length - 8);
- var pathBuf = rodataBuf.Slice(8, pathLength);
+ Span pathBuf = rodataBuf.Slice(8, pathLength);
int lastSlash = pathBuf.LastIndexOfAny(new byte[] { (byte)'\\', (byte)'/' });
moduleName = Encoding.ASCII.GetString(pathBuf.Slice(lastSlash + 1).TrimEnd((byte)0));
@@ -483,12 +483,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
lock (_images)
{
- var image = new Image(textOffset, textSize, symbols.OrderBy(x => x.Value).ToArray());
+ Image image = new(textOffset, textSize, symbols.OrderBy(x => x.Value).ToArray());
- string moduleName;
- if (!GetModuleName(out moduleName, image))
+ if (!GetModuleName(out string moduleName, image))
{
- var newIndex = _images.Count;
+ int newIndex = _images.Count;
moduleName = $"(unknown{newIndex})";
}
image.Name = moduleName;
diff --git a/src/Ryujinx.Input.SDL2/SDL2JoyCon.cs b/src/Ryujinx.Input.SDL2/SDL2JoyCon.cs
index 0c00c1899..ee80881c2 100644
--- a/src/Ryujinx.Input.SDL2/SDL2JoyCon.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2JoyCon.cs
@@ -362,7 +362,7 @@ namespace Ryujinx.Input.SDL2
if (HasConfiguration)
{
- var joyconStickConfig = GetLogicalJoyStickConfig(inputId);
+ JoyconConfigControllerStick joyconStickConfig = GetLogicalJoyStickConfig(inputId);
if (joyconStickConfig != null)
{
@@ -398,7 +398,7 @@ namespace Ryujinx.Input.SDL2
public bool IsPressed(GamepadButtonInputId inputId)
{
- if (!_buttonsDriverMapping.TryGetValue(inputId, out var button))
+ if (!_buttonsDriverMapping.TryGetValue(inputId, out SDL_GameControllerButton button))
{
return false;
}
diff --git a/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs b/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
index a1e13aa45..be70cc4f9 100644
--- a/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2JoyConPair.cs
@@ -105,7 +105,7 @@ namespace Ryujinx.Input.SDL2
private static (int leftIndex, int rightIndex) DetectJoyConPair(List gamepadsIds)
{
- var gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
+ List gamepadNames = gamepadsIds.Where(gamepadId => gamepadId != Id)
.Select((_, index) => SDL_GameControllerNameForIndex(index)).ToList();
int leftIndex = gamepadNames.IndexOf(SDL2JoyCon.LeftName);
int rightIndex = gamepadNames.IndexOf(SDL2JoyCon.RightName);
diff --git a/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs b/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
index 48bc1571a..216ffc33c 100644
--- a/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
+++ b/src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
@@ -848,7 +848,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
TimeSpan temporary = TimeSpan.Zero;
- foreach (var installedApplication in Applications.Items)
+ foreach (ApplicationData installedApplication in Applications.Items)
{
temporary += LoadAndSaveMetaData(installedApplication.IdString).TimePlayed;
}
diff --git a/src/Ryujinx/Systems/Rebooter.cs b/src/Ryujinx/Systems/Rebooter.cs
index 5360edee9..bb91f608f 100644
--- a/src/Ryujinx/Systems/Rebooter.cs
+++ b/src/Ryujinx/Systems/Rebooter.cs
@@ -54,7 +54,7 @@ namespace Ryujinx.Ava.Systems
WorkingDirectory = executableDirectory,
};
- foreach (var arg in args)
+ foreach (string arg in args)
{
processStart.ArgumentList.Add(arg);
}
diff --git a/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs b/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
index 3ab2fdc70..2d1468a6b 100644
--- a/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
+++ b/src/Ryujinx/UI/Applet/AvaloniaHostUITheme.cs
@@ -50,7 +50,7 @@ namespace Ryujinx.Ava.UI.Applet
private string GetWindowsFontByLanguage()
{
- var culture = CultureInfo.CurrentUICulture;
+ CultureInfo culture = CultureInfo.CurrentUICulture;
string langCode = culture.Name;
return culture.TwoLetterISOLanguageName switch
diff --git a/src/Ryujinx/UI/Models/LdnGameModel.cs b/src/Ryujinx/UI/Models/LdnGameModel.cs
index d677c55ee..cd874be6c 100644
--- a/src/Ryujinx/UI/Models/LdnGameModel.cs
+++ b/src/Ryujinx/UI/Models/LdnGameModel.cs
@@ -107,7 +107,7 @@ namespace Ryujinx.Ava.UI.Models
private static async Task GetAllAsyncRequestImpl(HttpClient client = null)
{
- var ldnWebHost = ConfigurationState.Instance.Multiplayer.GetLdnWebServer();
+ string ldnWebHost = ConfigurationState.Instance.Multiplayer.GetLdnWebServer();
LocaleManager.Associate(LocaleKeys.LdnGameListRefreshToolTip, ldnWebHost);
diff --git a/src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs b/src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs
index 4bd9aa92d..f15c27df7 100644
--- a/src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/LdnGamesListViewModel.cs
@@ -35,7 +35,7 @@ namespace Ryujinx.Ava.UI.ViewModels
SortApply();
}
- var filtered = _visibleEntries;
+ IEnumerable filtered = _visibleEntries;
if (OnlyShowForOwnedGames)
filtered = filtered.Where(x => _ownedGameTitleIds.ContainsIgnoreCase(x.Title.Id));
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index c11051348..53734ef19 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -348,7 +348,7 @@ namespace Ryujinx.Ava.UI.ViewModels
{
if (ts.HasValue)
{
- var formattedPlayTime = ValueFormatUtils.FormatTimeSpan(ts.Value);
+ string formattedPlayTime = ValueFormatUtils.FormatTimeSpan(ts.Value);
LocaleManager.Associate(LocaleKeys.GameListLabelTotalTimePlayed, formattedPlayTime);
ShowTotalTimePlayed = formattedPlayTime != string.Empty;
return;
@@ -827,10 +827,10 @@ namespace Ryujinx.Ava.UI.ViewModels
private void RefreshGrid()
{
- var appsList = Applications.ToObservableChangeSet()
+ IObservableList appsList = Applications.ToObservableChangeSet()
.Filter(Filter)
.Sort(GetComparer())
- .Bind(out var apps)
+ .Bind(out ReadOnlyObservableCollection apps)
.AsObservableList();
AppsObservableList = apps;
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 54fd951fb..acf7517d8 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -447,9 +447,9 @@ namespace Ryujinx.Ava.UI.ViewModels
_virtualFileSystem = virtualFileSystem;
_contentManager = contentManager;
- if (gameIconData != null && gameIconData.Length > 0)
+ if (gameIconData is { Length: > 0 })
{
- using var ms = new MemoryStream(gameIconData);
+ using MemoryStream ms = new(gameIconData);
_gameIcon = new Bitmap(ms);
}