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/VertexBufferState.cs | 26 +++++++++++-------------
 1 file changed, 12 insertions(+), 14 deletions(-)

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

diff --git a/src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs b/src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs
index 2118bfae..cbbd829a 100644
--- a/src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VertexBufferState.cs
@@ -1,10 +1,10 @@
-using BufferHandle = Ryujinx.Graphics.GAL.BufferHandle;
+using Ryujinx.Graphics.GAL;
 
 namespace Ryujinx.Graphics.Vulkan
 {
     internal struct VertexBufferState
     {
-        public static VertexBufferState Null => new VertexBufferState(null, 0, 0, 0);
+        public static VertexBufferState Null => new(null, 0, 0, 0);
 
         private readonly int _offset;
         private readonly int _size;
@@ -74,17 +74,15 @@ namespace Ryujinx.Graphics.Vulkan
 
                     return;
                 }
-                else
-                {
-                    autoBuffer = gd.BufferManager.GetBuffer(cbs.CommandBuffer, _handle, false, out int size);
 
-                    // The original stride must be reapplied in case it was rewritten.
-                    state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)_stride;
+                autoBuffer = gd.BufferManager.GetBuffer(cbs.CommandBuffer, _handle, false, out int size);
 
-                    if (_offset >= size)
-                    {
-                        autoBuffer = null;
-                    }
+                // The original stride must be reapplied in case it was rewritten.
+                state.Internal.VertexBindingDescriptions[DescriptorIndex].Stride = (uint)_stride;
+
+                if (_offset >= size)
+                {
+                    autoBuffer = null;
                 }
             }
 
@@ -96,12 +94,12 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        public bool BoundEquals(Auto<DisposableBuffer> buffer)
+        public readonly bool BoundEquals(Auto<DisposableBuffer> buffer)
         {
             return _buffer == buffer;
         }
 
-        public bool Matches(Auto<DisposableBuffer> buffer, int descriptorIndex, int offset, int size, int stride = 0)
+        public readonly bool Matches(Auto<DisposableBuffer> buffer, int descriptorIndex, int offset, int size, int stride = 0)
         {
             return _buffer == buffer && DescriptorIndex == descriptorIndex && _offset == offset && _size == size && _stride == stride;
         }
@@ -117,7 +115,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        public void Dispose()
+        public readonly void Dispose()
         {
             // Only dispose if this buffer is not refetched on each bind.
 
-- 
cgit v1.2.3