From 40f2bd37e3b025ae3b932d15971d8a8e2f8b9866 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:10:55 +0200
Subject: [Ryujinx.Graphics.OpenGL] Address dotnet-format issues (#5372)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Address or silence dotnet format IDE1006 warnings

* Fix IDE0090 after rebase

* 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

* Another rebase, another dotnet format run

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Start working on disabled warnings

* Address a few disabled IDE0060 warnings

* Silence IDE0060 in .editorconfig

* 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

* Address review feedback
---
 src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs         | 4 ++--
 src/Ryujinx.Graphics.OpenGL/Effects/FxaaPostProcessingEffect.cs | 2 +-
 src/Ryujinx.Graphics.OpenGL/Effects/IPostProcessingEffect.cs    | 4 ++--
 src/Ryujinx.Graphics.OpenGL/Effects/IScalingFilter.cs           | 2 +-
 src/Ryujinx.Graphics.OpenGL/Effects/ShaderHelper.cs             | 1 -
 src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/Ryujinx.Graphics.OpenGL/Effects')

diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs b/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs
index 16678bb7..5daaf8c4 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs
@@ -37,7 +37,7 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             }
         }
 
-        public FsrScalingFilter(OpenGLRenderer renderer, IPostProcessingEffect filter)
+        public FsrScalingFilter(OpenGLRenderer renderer)
         {
             Initialize();
 
@@ -174,4 +174,4 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             GL.ActiveTexture((TextureUnit)previousUnit);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/FxaaPostProcessingEffect.cs b/src/Ryujinx.Graphics.OpenGL/Effects/FxaaPostProcessingEffect.cs
index 3a2d685b..c8f17084 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/FxaaPostProcessingEffect.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/FxaaPostProcessingEffect.cs
@@ -78,4 +78,4 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             return textureView;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/IPostProcessingEffect.cs b/src/Ryujinx.Graphics.OpenGL/Effects/IPostProcessingEffect.cs
index 7a045a02..154e7492 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/IPostProcessingEffect.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/IPostProcessingEffect.cs
@@ -3,9 +3,9 @@ using System;
 
 namespace Ryujinx.Graphics.OpenGL.Effects
 {
-    internal interface IPostProcessingEffect :  IDisposable
+    internal interface IPostProcessingEffect : IDisposable
     {
         const int LocalGroupSize = 64;
         TextureView Run(TextureView view, int width, int height);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/IScalingFilter.cs b/src/Ryujinx.Graphics.OpenGL/Effects/IScalingFilter.cs
index e1e1b2c1..b5c80878 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/IScalingFilter.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/IScalingFilter.cs
@@ -15,4 +15,4 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             Extents2D source,
             Extents2D destination);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/ShaderHelper.cs b/src/Ryujinx.Graphics.OpenGL/Effects/ShaderHelper.cs
index 72c5a98f..976b3410 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/ShaderHelper.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/ShaderHelper.cs
@@ -1,5 +1,4 @@
 using OpenTK.Graphics.OpenGL;
-using System;
 
 namespace Ryujinx.Graphics.OpenGL.Effects
 {
diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs b/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
index 1ad300c8..eede852f 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/SmaaPostProcessingEffect.cs
@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.OpenGL.Effects.Smaa
         private int[] _neighbourShaderPrograms;
         private TextureStorage _edgeOutputTexture;
         private TextureStorage _blendOutputTexture;
-        private string[] _qualities;
+        private readonly string[] _qualities;
         private int _inputUniform;
         private int _outputUniform;
         private int _samplerAreaUniform;
-- 
cgit v1.2.3