From 7c989f88bdab65dfa7783e824a180220ba829bd0 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Wed, 28 Jun 2023 20:20:10 +0200
Subject: [Ryujinx.Graphics.GAL] Address dotnet-format issues (#5366)

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

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA1069 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

* Revert formatting changes for while and for-loops

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

* Start working on disabled warnings

* Address IDE0251 warnings

* 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

* Add trailing commas

* Remove SuppressMessage for IDE0066

* Make explicit Equals implementation implicit
---
 .../Multithreading/BufferMap.cs                    | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs')

diff --git a/src/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs b/src/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs
index 24b0af2d..c30df046 100644
--- a/src/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs
+++ b/src/Ryujinx.Graphics.GAL/Multithreading/BufferMap.cs
@@ -15,9 +15,9 @@ namespace Ryujinx.Graphics.GAL.Multithreading
     {
         private ulong _bufferHandle = 0;
 
-        private Dictionary<BufferHandle, BufferHandle> _bufferMap = new Dictionary<BufferHandle, BufferHandle>();
-        private HashSet<BufferHandle> _inFlight = new HashSet<BufferHandle>();
-        private AutoResetEvent _inFlightChanged = new AutoResetEvent(false);
+        private readonly Dictionary<BufferHandle, BufferHandle> _bufferMap = new();
+        private readonly HashSet<BufferHandle> _inFlight = new();
+        private readonly AutoResetEvent _inFlightChanged = new(false);
 
         internal BufferHandle CreateBufferHandle()
         {
@@ -59,14 +59,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading
         internal BufferHandle MapBuffer(BufferHandle handle)
         {
             // Maps a threaded buffer to a backend one.
-            // Threaded buffers are returned on creation as the buffer 
+            // Threaded buffers are returned on creation as the buffer
             // isn't actually created until the queue runs the command.
 
-            BufferHandle result;
-
             lock (_bufferMap)
             {
-                if (!_bufferMap.TryGetValue(handle, out result))
+                if (!_bufferMap.TryGetValue(handle, out BufferHandle result))
                 {
                     result = BufferHandle.Null;
                 }
@@ -79,11 +77,10 @@ namespace Ryujinx.Graphics.GAL.Multithreading
         {
             // Blocks until the handle is available.
 
-            BufferHandle result;
 
             lock (_bufferMap)
             {
-                if (_bufferMap.TryGetValue(handle, out result))
+                if (_bufferMap.TryGetValue(handle, out BufferHandle result))
                 {
                     return result;
                 }
@@ -128,9 +125,8 @@ namespace Ryujinx.Graphics.GAL.Multithreading
                 for (int i = 0; i < ranges.Length; i++)
                 {
                     ref BufferRange range = ref ranges[i];
-                    BufferHandle result;
 
-                    if (!_bufferMap.TryGetValue(range.Handle, out result))
+                    if (!_bufferMap.TryGetValue(range.Handle, out BufferHandle result))
                     {
                         result = BufferHandle.Null;
                     }
@@ -152,9 +148,8 @@ namespace Ryujinx.Graphics.GAL.Multithreading
                 {
                     ref BufferAssignment assignment = ref ranges[i];
                     BufferRange range = assignment.Range;
-                    BufferHandle result;
 
-                    if (!_bufferMap.TryGetValue(range.Handle, out result))
+                    if (!_bufferMap.TryGetValue(range.Handle, out BufferHandle result))
                     {
                         result = BufferHandle.Null;
                     }
@@ -175,9 +170,8 @@ namespace Ryujinx.Graphics.GAL.Multithreading
                 for (int i = 0; i < ranges.Length; i++)
                 {
                     BufferRange range = ranges[i].Buffer;
-                    BufferHandle result;
 
-                    if (!_bufferMap.TryGetValue(range.Handle, out result))
+                    if (!_bufferMap.TryGetValue(range.Handle, out BufferHandle result))
                     {
                         result = BufferHandle.Null;
                     }
-- 
cgit v1.2.3