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/BackgroundResources.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/src/Ryujinx.Graphics.Vulkan/BackgroundResources.cs b/src/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
index b93b7a25..e9478b43 100644
--- a/src/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
+++ b/src/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.Graphics.Vulkan
 {
     class BackgroundResource : IDisposable
     {
-        private VulkanRenderer _gd;
+        private readonly VulkanRenderer _gd;
         private Device _device;
 
         private CommandBufferPool _pool;
@@ -38,10 +38,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         public PersistentFlushBuffer GetFlushBuffer()
         {
-            if (_flushBuffer == null)
-            {
-                _flushBuffer = new PersistentFlushBuffer(_gd);
-            }
+            _flushBuffer ??= new PersistentFlushBuffer(_gd);
 
             return _flushBuffer;
         }
@@ -55,10 +52,10 @@ namespace Ryujinx.Graphics.Vulkan
 
     class BackgroundResources : IDisposable
     {
-        private VulkanRenderer _gd;
+        private readonly VulkanRenderer _gd;
         private Device _device;
 
-        private Dictionary<Thread, BackgroundResource> _resources;
+        private readonly Dictionary<Thread, BackgroundResource> _resources;
 
         public BackgroundResources(VulkanRenderer gd, Device device)
         {
@@ -89,8 +86,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             lock (_resources)
             {
-                BackgroundResource resource;
-                if (!_resources.TryGetValue(thread, out resource))
+                if (!_resources.TryGetValue(thread, out BackgroundResource resource))
                 {
                     Cleanup();
 
-- 
cgit v1.2.3