From 3b46bb73f781a011705ecbc8a1d3207dfb145829 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sun, 2 Jul 2023 02:47:54 +0200
Subject: [Ryujinx.Graphics.Gpu] Address dotnet-format issues (#5367)

* 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 IDE0052 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA1069 warnings

* Address or silence dotnet format CA2211 warnings

* Address remaining dotnet format analyzer warnings

* Address review comments

* 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

* Another rebase, another dotnet format run

* 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

* Remove a few unused parameters

* Replace MmeShadowScratch with Array256<uint>

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

* Start working on disabled warnings

* Fix and silence a few dotnet-format warnings again

* Run dotnet format after rebase

* Address IDE0251 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 pass of dotnet format

* Add unsafe dotnet format changes

* Fix typos

* Add trailing commas

* Disable formatting for FormatTable

* Address review feedback
---
 .../Synchronization/SynchronizationManager.cs      | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs')

diff --git a/src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs b/src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs
index 968de930..ccec763e 100644
--- a/src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs
+++ b/src/Ryujinx.Graphics.Gpu/Synchronization/SynchronizationManager.cs
@@ -17,7 +17,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
         /// <summary>
         /// Array containing all hardware syncpoints.
         /// </summary>
-        private Syncpoint[] _syncpoints;
+        private readonly Syncpoint[] _syncpoints;
 
         public SynchronizationManager()
         {
@@ -118,26 +118,24 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
                 timeout = TimeSpan.FromSeconds(1);
             }
 
-            using (ManualResetEvent waitEvent = new ManualResetEvent(false))
-            {
-                var info = _syncpoints[id].RegisterCallback(threshold, (x) => waitEvent.Set());
-
-                if (info == null)
-                {
-                    return false;
-                }
+            using ManualResetEvent waitEvent = new(false);
+            var info = _syncpoints[id].RegisterCallback(threshold, (x) => waitEvent.Set());
 
-                bool signaled = waitEvent.WaitOne(timeout);
+            if (info == null)
+            {
+                return false;
+            }
 
-                if (!signaled && info != null)
-                {
-                    Logger.Error?.Print(LogClass.Gpu, $"Wait on syncpoint {id} for threshold {threshold} took more than {timeout.TotalMilliseconds}ms, resuming execution...");
+            bool signaled = waitEvent.WaitOne(timeout);
 
-                    _syncpoints[id].UnregisterCallback(info);
-                }
+            if (!signaled && info != null)
+            {
+                Logger.Error?.Print(LogClass.Gpu, $"Wait on syncpoint {id} for threshold {threshold} took more than {timeout.TotalMilliseconds}ms, resuming execution...");
 
-                return !signaled;
+                _syncpoints[id].UnregisterCallback(info);
             }
+
+            return !signaled;
         }
     }
 }
-- 
cgit v1.2.3