From 801b71a12883f8a104c699a92a9aa997e2a6d609 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sat, 1 Jul 2023 12:31:42 +0200
Subject: [Ryujinx.Graphics.Vulkan] Address dotnet-format issues (#5378)

* 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

* Silence dotnet format IDE0059 warnings

* Address dotnet format CA1816 warnings

* Fix new dotnet-format issues 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 whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers 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

* 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

* 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

* Remove redundant code

* Rename generics

* Address review feedback

* Remove SetOrigin
---
 src/Ryujinx.Graphics.Vulkan/AutoFlushCounter.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/Ryujinx.Graphics.Vulkan/AutoFlushCounter.cs')

diff --git a/src/Ryujinx.Graphics.Vulkan/AutoFlushCounter.cs b/src/Ryujinx.Graphics.Vulkan/AutoFlushCounter.cs
index 4e2a9d6b..8ac412fe 100644
--- a/src/Ryujinx.Graphics.Vulkan/AutoFlushCounter.cs
+++ b/src/Ryujinx.Graphics.Vulkan/AutoFlushCounter.cs
@@ -8,16 +8,16 @@ namespace Ryujinx.Graphics.Vulkan
     internal class AutoFlushCounter
     {
         // How often to flush on framebuffer change.
-        private readonly static long FramebufferFlushTimer = Stopwatch.Frequency / 1000; // (1ms)
+        private readonly static long _framebufferFlushTimer = Stopwatch.Frequency / 1000; // (1ms)
 
         // How often to flush on draw when fast flush mode is enabled.
-        private readonly static long DrawFlushTimer = Stopwatch.Frequency / 666; // (1.5ms)
+        private readonly static long _drawFlushTimer = Stopwatch.Frequency / 666; // (1.5ms)
 
         // Average wait time that triggers fast flush mode to be entered.
-        private readonly static long FastFlushEnterThreshold = Stopwatch.Frequency / 666; // (1.5ms)
+        private readonly static long _fastFlushEnterThreshold = Stopwatch.Frequency / 666; // (1.5ms)
 
         // Average wait time that triggers fast flush mode to be exited.
-        private readonly static long FastFlushExitThreshold = Stopwatch.Frequency / 10000; // (0.1ms)
+        private readonly static long _fastFlushExitThreshold = Stopwatch.Frequency / 10000; // (0.1ms)
 
         // Number of frames to average waiting times over.
         private const int SyncWaitAverageCount = 20;
@@ -34,11 +34,11 @@ namespace Ryujinx.Graphics.Vulkan
         private int _consecutiveQueries;
         private int _queryCount;
 
-        private int[] _queryCountHistory = new int[3];
+        private readonly int[] _queryCountHistory = new int[3];
         private int _queryCountHistoryIndex;
         private int _remainingQueries;
 
-        private long[] _syncWaitHistory = new long[SyncWaitAverageCount];
+        private readonly long[] _syncWaitHistory = new long[SyncWaitAverageCount];
         private int _syncWaitHistoryIndex;
 
         private bool _fastFlushMode;
@@ -110,7 +110,7 @@ namespace Ryujinx.Graphics.Vulkan
                     return false;
                 }
 
-                long flushTimeout = DrawFlushTimer;
+                long flushTimeout = _drawFlushTimer;
 
                 long now = Stopwatch.GetTimestamp();
 
@@ -144,7 +144,7 @@ namespace Ryujinx.Graphics.Vulkan
                 return false;
             }
 
-            long flushTimeout = FramebufferFlushTimer;
+            long flushTimeout = _framebufferFlushTimer;
 
             long now = Stopwatch.GetTimestamp();
 
@@ -169,7 +169,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             long averageWait = (long)_syncWaitHistory.Average();
 
-            if (_fastFlushMode ? averageWait < FastFlushExitThreshold : averageWait > FastFlushEnterThreshold)
+            if (_fastFlushMode ? averageWait < _fastFlushExitThreshold : averageWait > _fastFlushEnterThreshold)
             {
                 _fastFlushMode = !_fastFlushMode;
                 Logger.Debug?.PrintMsg(LogClass.Gpu, $"Switched fast flush mode: ({_fastFlushMode})");
-- 
cgit v1.2.3