From 9becbd7d728fc2002c176dfd9d1d1aae86f86b12 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:59:13 +0200
Subject: [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
---
.../Translation/ControlFlowGraph.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'src/Ryujinx.Graphics.Shader/Translation/ControlFlowGraph.cs')
diff --git a/src/Ryujinx.Graphics.Shader/Translation/ControlFlowGraph.cs b/src/Ryujinx.Graphics.Shader/Translation/ControlFlowGraph.cs
index 65328fd7..9b07c28f 100644
--- a/src/Ryujinx.Graphics.Shader/Translation/ControlFlowGraph.cs
+++ b/src/Ryujinx.Graphics.Shader/Translation/ControlFlowGraph.cs
@@ -13,11 +13,11 @@ namespace Ryujinx.Graphics.Shader.Translation
{
Blocks = blocks;
- HashSet<BasicBlock> visited = new HashSet<BasicBlock>();
+ HashSet<BasicBlock> visited = new();
- Stack<BasicBlock> blockStack = new Stack<BasicBlock>();
+ Stack<BasicBlock> blockStack = new();
- List<BasicBlock> postOrderBlocks = new List<BasicBlock>(blocks.Length);
+ List<BasicBlock> postOrderBlocks = new(blocks.Length);
PostOrderMap = new int[blocks.Length];
@@ -50,9 +50,9 @@ namespace Ryujinx.Graphics.Shader.Translation
public static ControlFlowGraph Create(Operation[] operations)
{
- Dictionary<Operand, BasicBlock> labels = new Dictionary<Operand, BasicBlock>();
+ Dictionary<Operand, BasicBlock> labels = new();
- List<BasicBlock> blocks = new List<BasicBlock>();
+ List<BasicBlock> blocks = new();
BasicBlock currentBlock = null;
@@ -68,7 +68,7 @@ namespace Ryujinx.Graphics.Shader.Translation
void NewNextBlock()
{
- BasicBlock block = new BasicBlock(blocks.Count);
+ BasicBlock block = new(blocks.Count);
blocks.Add(block);
@@ -110,7 +110,7 @@ namespace Ryujinx.Graphics.Shader.Translation
currentBlock.Operations.AddLast(operation);
}
- needsNewBlock = operation.Inst == Instruction.Branch ||
+ needsNewBlock = operation.Inst == Instruction.Branch ||
operation.Inst == Instruction.BranchIfTrue ||
operation.Inst == Instruction.BranchIfFalse;
@@ -173,4 +173,4 @@ namespace Ryujinx.Graphics.Shader.Translation
return false;
}
}
-}
\ No newline at end of file
+}
--
cgit v1.2.3-70-g09d2