[Ryujinx.Graphics.Shader] Address dotnet-format issues (#5373)
* dotnet format style --severity info Some changes were manually reverted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format CA1069 warnings * Address or silence dotnet format CA2211 warnings * Address review comments * Fix formatting for switch expressions * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Run dotnet format after rebase * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Run dotnet format after rebase * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Add trailing commas * Remove unused members and most unnecessary value assignments * Remove more unnecessary assignments * Remove NRE suppressor
This commit is contained in:
TSRBerry
GitHub
@@ -4,7 +4,6 @@ using Ryujinx.Graphics.Shader.Translation;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Numerics;
|
||||
|
||||
using static Ryujinx.Graphics.Shader.Instructions.InstEmitHelper;
|
||||
using static Ryujinx.Graphics.Shader.IntermediateRepresentation.OperandHelper;
|
||||
|
||||
@@ -221,7 +220,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
|
||||
Operand destOperand = dest != RegisterConsts.RegisterZeroIndex ? Register(dest, RegisterType.Gpr) : null;
|
||||
|
||||
List<Operand> sourcesList = new List<Operand>();
|
||||
List<Operand> sourcesList = new();
|
||||
|
||||
if (isBindless)
|
||||
{
|
||||
@@ -325,7 +324,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
return context.Copy(Register(srcA++, RegisterType.Gpr));
|
||||
}
|
||||
|
||||
List<Operand> sourcesList = new List<Operand>();
|
||||
List<Operand> sourcesList = new();
|
||||
|
||||
if (isBindless)
|
||||
{
|
||||
@@ -445,10 +444,18 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
|
||||
switch (size)
|
||||
{
|
||||
case SuSize.U8: context.Copy(dests[0], ZeroExtendTo32(context, dests[0], 8)); break;
|
||||
case SuSize.U16: context.Copy(dests[0], ZeroExtendTo32(context, dests[0], 16)); break;
|
||||
case SuSize.S8: context.Copy(dests[0], SignExtendTo32(context, dests[0], 8)); break;
|
||||
case SuSize.S16: context.Copy(dests[0], SignExtendTo32(context, dests[0], 16)); break;
|
||||
case SuSize.U8:
|
||||
context.Copy(dests[0], ZeroExtendTo32(context, dests[0], 8));
|
||||
break;
|
||||
case SuSize.U16:
|
||||
context.Copy(dests[0], ZeroExtendTo32(context, dests[0], 16));
|
||||
break;
|
||||
case SuSize.S8:
|
||||
context.Copy(dests[0], SignExtendTo32(context, dests[0], 8));
|
||||
break;
|
||||
case SuSize.S16:
|
||||
context.Copy(dests[0], SignExtendTo32(context, dests[0], 16));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -493,7 +500,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
return context.Copy(Register(srcB++, RegisterType.Gpr));
|
||||
}
|
||||
|
||||
List<Operand> sourcesList = new List<Operand>();
|
||||
List<Operand> sourcesList = new();
|
||||
|
||||
if (isBindless)
|
||||
{
|
||||
@@ -600,7 +607,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
return context.Copy(Register(srcB++, RegisterType.Gpr));
|
||||
}
|
||||
|
||||
List<Operand> sourcesList = new List<Operand>();
|
||||
List<Operand> sourcesList = new();
|
||||
|
||||
if (isBindless)
|
||||
{
|
||||
@@ -699,7 +706,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuatomSize.S64 => 3,
|
||||
SuatomSize.Sd32 => 2,
|
||||
SuatomSize.Sd64 => 3,
|
||||
_ => 2
|
||||
_ => 2,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -715,7 +722,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuatomSize.S64 => TextureFormat.R32G32Uint,
|
||||
SuatomSize.Sd32 => TextureFormat.R32Uint,
|
||||
SuatomSize.Sd64 => TextureFormat.R32G32Uint,
|
||||
_ => TextureFormat.R32Uint
|
||||
_ => TextureFormat.R32Uint,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -732,7 +739,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuatomOp.Or => TextureFlags.BitwiseOr,
|
||||
SuatomOp.Xor => TextureFlags.BitwiseXor,
|
||||
SuatomOp.Exch => TextureFlags.Swap,
|
||||
_ => TextureFlags.Add
|
||||
_ => TextureFlags.Add,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -743,7 +750,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuSize.B64 => 2,
|
||||
SuSize.B128 => 4,
|
||||
SuSize.UB128 => 4,
|
||||
_ => 1
|
||||
_ => 1,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -759,7 +766,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuSize.B64 => 3,
|
||||
SuSize.B128 => 4,
|
||||
SuSize.UB128 => 4,
|
||||
_ => 2
|
||||
_ => 2,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -775,7 +782,7 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuSize.B64 => TextureFormat.R32G32Uint,
|
||||
SuSize.B128 => TextureFormat.R32G32B32A32Uint,
|
||||
SuSize.UB128 => TextureFormat.R32G32B32A32Uint,
|
||||
_ => TextureFormat.R32Uint
|
||||
_ => TextureFormat.R32Uint,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -789,8 +796,8 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
SuDim._2d => SamplerType.Texture2D,
|
||||
SuDim._2dArray => SamplerType.Texture2D | SamplerType.Array,
|
||||
SuDim._3d => SamplerType.Texture3D,
|
||||
_ => SamplerType.None
|
||||
_ => SamplerType.None,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user