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
---
 src/Ryujinx.Graphics.Shader/SamplerType.cs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/Ryujinx.Graphics.Shader/SamplerType.cs')

diff --git a/src/Ryujinx.Graphics.Shader/SamplerType.cs b/src/Ryujinx.Graphics.Shader/SamplerType.cs
index 620f4ccf..85e97368 100644
--- a/src/Ryujinx.Graphics.Shader/SamplerType.cs
+++ b/src/Ryujinx.Graphics.Shader/SamplerType.cs
@@ -15,10 +15,10 @@ namespace Ryujinx.Graphics.Shader
 
         Mask = 0xff,
 
-        Array       = 1 << 8,
-        Indexed     = 1 << 9,
+        Array = 1 << 8,
+        Indexed = 1 << 9,
         Multisample = 1 << 10,
-        Shadow      = 1 << 11
+        Shadow = 1 << 11,
     }
 
     static class SamplerTypeExtensions
@@ -32,7 +32,7 @@ namespace Ryujinx.Graphics.Shader
                 SamplerType.Texture2D => 2,
                 SamplerType.Texture3D => 3,
                 SamplerType.TextureCube => 3,
-                _ => throw new ArgumentException($"Invalid sampler type \"{type}\".")
+                _ => throw new ArgumentException($"Invalid sampler type \"{type}\"."),
             };
         }
 
@@ -45,7 +45,7 @@ namespace Ryujinx.Graphics.Shader
                 SamplerType.Texture2D => "sampler2D",
                 SamplerType.Texture3D => "sampler3D",
                 SamplerType.TextureCube => "samplerCube",
-                _ => throw new ArgumentException($"Invalid sampler type \"{type}\".")
+                _ => throw new ArgumentException($"Invalid sampler type \"{type}\"."),
             };
 
             if ((type & SamplerType.Multisample) != 0)
@@ -75,7 +75,7 @@ namespace Ryujinx.Graphics.Shader
                 SamplerType.Texture2D => "image2D",
                 SamplerType.Texture3D => "image3D",
                 SamplerType.TextureCube => "imageCube",
-                _ => throw new ArgumentException($"Invalid sampler type \"{type}\".")
+                _ => throw new ArgumentException($"Invalid sampler type \"{type}\"."),
             };
 
             if ((type & SamplerType.Multisample) != 0)
@@ -90,11 +90,15 @@ namespace Ryujinx.Graphics.Shader
 
             switch (componentType)
             {
-                case AggregateType.U32: typeName = 'u' + typeName; break;
-                case AggregateType.S32: typeName = 'i' + typeName; break;
+                case AggregateType.U32:
+                    typeName = 'u' + typeName;
+                    break;
+                case AggregateType.S32:
+                    typeName = 'i' + typeName;
+                    break;
             }
 
             return typeName;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3