12 files changed, 17 insertions, 22 deletions
diff --git a/src/Ryujinx.Graphics.OpenGL/EnumConversion.cs b/src/Ryujinx.Graphics.OpenGL/EnumConversion.cs
index c9a1eaa9..417dc3f6 100644
--- a/src/Ryujinx.Graphics.OpenGL/EnumConversion.cs
+++ b/src/Ryujinx.Graphics.OpenGL/EnumConversion.cs
@@ -668,7 +668,7 @@ namespace Ryujinx.Graphics.OpenGL
                 ShaderStage.TessellationEvaluation => ShaderType.TessEvaluationShader,
                 ShaderStage.Geometry => ShaderType.GeometryShader,
                 ShaderStage.Fragment => ShaderType.FragmentShader,
-                _ => ShaderType.VertexShader
+                _ => ShaderType.VertexShader,
             };
         }
     }
diff --git a/src/Ryujinx.Graphics.OpenGL/HwCapabilities.cs b/src/Ryujinx.Graphics.OpenGL/HwCapabilities.cs
index d7d99345..617b129a 100644
--- a/src/Ryujinx.Graphics.OpenGL/HwCapabilities.cs
+++ b/src/Ryujinx.Graphics.OpenGL/HwCapabilities.cs
@@ -37,7 +37,7 @@ namespace Ryujinx.Graphics.OpenGL
             AmdUnix,
             IntelWindows,
             IntelUnix,
-            Nvidia
+            Nvidia,
         }
 
         private static readonly Lazy<GpuVendor> _gpuVendor = new(GetGpuVendor);
diff --git a/src/Ryujinx.Graphics.OpenGL/Image/Sampler.cs b/src/Ryujinx.Graphics.OpenGL/Image/Sampler.cs
index 18dd1b72..6cf04829 100644
--- a/src/Ryujinx.Graphics.OpenGL/Image/Sampler.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Image/Sampler.cs
@@ -33,7 +33,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                     info.BorderColor.Red,
                     info.BorderColor.Green,
                     info.BorderColor.Blue,
-                    info.BorderColor.Alpha
+                    info.BorderColor.Alpha,
                 };
 
                 GL.SamplerParameter(Handle, SamplerParameterName.TextureBorderColor, borderColor);
diff --git a/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyIncompatible.cs b/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyIncompatible.cs
index 6b5fb376..082e6ccf 100644
--- a/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyIncompatible.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyIncompatible.cs
@@ -133,7 +133,7 @@ void main()
                     1 => SizedInternalFormat.R8ui,
                     2 => SizedInternalFormat.Rg8ui,
                     4 => SizedInternalFormat.Rgba8ui,
-                    _ => throw new ArgumentException($"Invalid components count {componentsCount}.")
+                    _ => throw new ArgumentException($"Invalid components count {componentsCount}."),
                 };
             }
             else if (componentSize == 2)
@@ -143,7 +143,7 @@ void main()
                     1 => SizedInternalFormat.R16ui,
                     2 => SizedInternalFormat.Rg16ui,
                     4 => SizedInternalFormat.Rgba16ui,
-                    _ => throw new ArgumentException($"Invalid components count {componentsCount}.")
+                    _ => throw new ArgumentException($"Invalid components count {componentsCount}."),
                 };
             }
             else if (componentSize == 4)
@@ -153,7 +153,7 @@ void main()
                     1 => SizedInternalFormat.R32ui,
                     2 => SizedInternalFormat.Rg32ui,
                     4 => SizedInternalFormat.Rgba32ui,
-                    _ => throw new ArgumentException($"Invalid components count {componentsCount}.")
+                    _ => throw new ArgumentException($"Invalid components count {componentsCount}."),
                 };
             }
             else
diff --git a/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyMS.cs b/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyMS.cs
index 39f23272..0fa6453d 100644
--- a/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyMS.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Image/TextureCopyMS.cs
@@ -173,7 +173,7 @@ void main()
                 4 => SizedInternalFormat.R32ui,
                 8 => SizedInternalFormat.Rg32ui,
                 16 => SizedInternalFormat.Rgba32ui,
-                _ => throw new ArgumentException($"Invalid bytes per pixel {bytesPerPixel}.")
+                _ => throw new ArgumentException($"Invalid bytes per pixel {bytesPerPixel}."),
             };
         }
 
diff --git a/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs b/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
index f4b1e0da..0f5fe46a 100644
--- a/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Image/TextureView.cs
@@ -72,7 +72,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                 (int)Info.SwizzleR.Convert(),
                 (int)Info.SwizzleG.Convert(),
                 (int)Info.SwizzleB.Convert(),
-                (int)Info.SwizzleA.Convert()
+                (int)Info.SwizzleA.Convert(),
             };
 
             if (Info.Format == Format.A1B5G5R5Unorm)
@@ -210,7 +210,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                 {
                     Target.Texture2DMultisample => Target.Texture2D,
                     Target.Texture2DMultisampleArray => Target.Texture2DArray,
-                    _ => Target
+                    _ => Target,
                 };
 
                 TextureView intermmediate = _renderer.TextureCopy.IntermediatePool.GetOrCreateWithAtLeast(
@@ -354,7 +354,7 @@ namespace Ryujinx.Graphics.OpenGL.Image
                     TextureTarget.TextureCubeMapArray => (layer / 6) * mipSize,
                     TextureTarget.Texture1DArray => layer * mipSize,
                     TextureTarget.Texture2DArray => layer * mipSize,
-                    _ => 0
+                    _ => 0,
                 };
             }
 
diff --git a/src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs b/src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs
index 1ad927ea..47b832f2 100644
--- a/src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs
+++ b/src/Ryujinx.Graphics.OpenGL/OpenGLRenderer.cs
@@ -210,7 +210,7 @@ namespace Ryujinx.Graphics.OpenGL
                 GL.Arb.MaxShaderCompilerThreads(Math.Min(Environment.ProcessorCount, 8));
             }
 
-            _counters.Initialize(_pipeline);
+            _counters.Initialize();
 
             // This is required to disable [0, 1] clamping for SNorm outputs on compatibility profiles.
             // This call is expected to fail if we're running with a core profile,
diff --git a/src/Ryujinx.Graphics.OpenGL/Pipeline.cs b/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
index 85f5b113..923c85d7 100644
--- a/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Pipeline.cs
@@ -5,7 +5,6 @@ using Ryujinx.Graphics.OpenGL.Image;
 using Ryujinx.Graphics.OpenGL.Queries;
 using Ryujinx.Graphics.Shader;
 using System;
-using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Graphics.OpenGL
 {
@@ -44,7 +43,7 @@ namespace Ryujinx.Graphics.OpenGL
 
         private CounterQueueEvent _activeConditionalRender;
 
-        private Vector4<int>[] _fpIsBgra = new Vector4<int>[SupportBuffer.FragmentIsBgraCount];
+        private readonly Vector4<int>[] _fpIsBgra = new Vector4<int>[SupportBuffer.FragmentIsBgraCount];
 
         private readonly (TextureBase, Format)[] _images;
         private TextureBase _unit0Texture;
diff --git a/src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs b/src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
index 1724616e..c430ffc3 100644
--- a/src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Queries/CounterQueue.cs
@@ -13,8 +13,6 @@ namespace Ryujinx.Graphics.OpenGL.Queries
         public CounterType Type { get; }
         public bool Disposed { get; private set; }
 
-        private readonly Pipeline _pipeline;
-
         private readonly Queue<CounterQueueEvent> _events = new();
         private CounterQueueEvent _current;
 
@@ -30,12 +28,10 @@ namespace Ryujinx.Graphics.OpenGL.Queries
 
         private readonly Thread _consumerThread;
 
-        internal CounterQueue(Pipeline pipeline, CounterType type)
+        internal CounterQueue(CounterType type)
         {
             Type = type;
 
-            _pipeline = pipeline;
-
             QueryTarget glType = GetTarget(Type);
 
             _queryPool = new Queue<BufferedQuery>(QueryPoolInitialSize);
diff --git a/src/Ryujinx.Graphics.OpenGL/Queries/Counters.cs b/src/Ryujinx.Graphics.OpenGL/Queries/Counters.cs
index 88e8bf91..1530c9d2 100644
--- a/src/Ryujinx.Graphics.OpenGL/Queries/Counters.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Queries/Counters.cs
@@ -14,12 +14,12 @@ namespace Ryujinx.Graphics.OpenGL.Queries
             _counterQueues = new CounterQueue[count];
         }
 
-        public void Initialize(Pipeline pipeline)
+        public void Initialize()
         {
             for (int index = 0; index < _counterQueues.Length; index++)
             {
                 CounterType type = (CounterType)index;
-                _counterQueues[index] = new CounterQueue(pipeline, type);
+                _counterQueues[index] = new CounterQueue(type);
             }
         }
 
diff --git a/src/Ryujinx.Graphics.OpenGL/ResourcePool.cs b/src/Ryujinx.Graphics.OpenGL/ResourcePool.cs
index 43410c99..20ef9e87 100644
--- a/src/Ryujinx.Graphics.OpenGL/ResourcePool.cs
+++ b/src/Ryujinx.Graphics.OpenGL/ResourcePool.cs
@@ -41,7 +41,7 @@ namespace Ryujinx.Graphics.OpenGL
                 {
                     Info = view.Info,
                     View = view,
-                    RemainingFrames = DisposedLiveFrames
+                    RemainingFrames = DisposedLiveFrames,
                 });
             }
         }
diff --git a/src/Ryujinx.Graphics.OpenGL/Sync.cs b/src/Ryujinx.Graphics.OpenGL/Sync.cs
index 54e9c6d3..b7ee3d3c 100644
--- a/src/Ryujinx.Graphics.OpenGL/Sync.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Sync.cs
@@ -24,7 +24,7 @@ namespace Ryujinx.Graphics.OpenGL
             SyncHandle handle = new()
             {
                 ID = id,
-                Handle = GL.FenceSync(SyncCondition.SyncGpuCommandsComplete, WaitSyncFlags.None)
+                Handle = GL.FenceSync(SyncCondition.SyncGpuCommandsComplete, WaitSyncFlags.None),
             };