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/ShaderHeader.cs | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
(limited to 'src/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs')
diff --git a/src/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs b/src/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs
index 01f7f08a..39f01b1c 100644
--- a/src/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs
+++ b/src/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs
@@ -9,7 +9,7 @@ namespace Ryujinx.Graphics.Shader.Translation
Unused = 0,
Constant = 1,
Perspective = 2,
- ScreenLinear = 3
+ ScreenLinear = 3,
}
readonly struct ImapPixelType
@@ -29,9 +29,19 @@ namespace Ryujinx.Graphics.Shader.Translation
public PixelImap GetFirstUsedType()
{
- if (X != PixelImap.Unused) return X;
- if (Y != PixelImap.Unused) return Y;
- if (Z != PixelImap.Unused) return Z;
+ if (X != PixelImap.Unused)
+ {
+ return X;
+ }
+ if (Y != PixelImap.Unused)
+ {
+ return Y;
+ }
+ if (Z != PixelImap.Unused)
+ {
+ return Z;
+ }
+
return W;
}
}
@@ -155,4 +165,4 @@ namespace Ryujinx.Graphics.Shader.Translation
OmapDepth = type2Omap.Extract(1);
}
}
-}
\ No newline at end of file
+}
--
cgit v1.2.3-70-g09d2