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/IndexBufferState.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

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

diff --git a/src/Ryujinx.Graphics.Vulkan/IndexBufferState.cs b/src/Ryujinx.Graphics.Vulkan/IndexBufferState.cs
index 75b18456..e81268e9 100644
--- a/src/Ryujinx.Graphics.Vulkan/IndexBufferState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/IndexBufferState.cs
@@ -1,19 +1,20 @@
-using Silk.NET.Vulkan;
+using Ryujinx.Graphics.GAL;
+using IndexType = Silk.NET.Vulkan.IndexType;
 
 namespace Ryujinx.Graphics.Vulkan
 {
     internal struct IndexBufferState
     {
-        public static IndexBufferState Null => new IndexBufferState(GAL.BufferHandle.Null, 0, 0);
+        public static IndexBufferState Null => new(BufferHandle.Null, 0, 0);
 
         private readonly int _offset;
         private readonly int _size;
         private readonly IndexType _type;
 
-        private readonly GAL.BufferHandle _handle;
+        private readonly BufferHandle _handle;
         private Auto<DisposableBuffer> _buffer;
 
-        public IndexBufferState(GAL.BufferHandle handle, int offset, int size, IndexType type)
+        public IndexBufferState(BufferHandle handle, int offset, int size, IndexType type)
         {
             _handle = handle;
             _offset = offset;
@@ -22,7 +23,7 @@ namespace Ryujinx.Graphics.Vulkan
             _buffer = null;
         }
 
-        public IndexBufferState(GAL.BufferHandle handle, int offset, int size)
+        public IndexBufferState(BufferHandle handle, int offset, int size)
         {
             _handle = handle;
             _offset = offset;
@@ -97,8 +98,8 @@ namespace Ryujinx.Graphics.Vulkan
         public Auto<DisposableBuffer> BindConvertedIndexBufferIndirect(
             VulkanRenderer gd,
             CommandBufferScoped cbs,
-            GAL.BufferRange indirectBuffer,
-            GAL.BufferRange drawCountBuffer,
+            BufferRange indirectBuffer,
+            BufferRange drawCountBuffer,
             IndexBufferPattern pattern,
             bool hasDrawCount,
             int maxDrawCount,
@@ -110,7 +111,7 @@ namespace Ryujinx.Graphics.Vulkan
             (var indexBufferAuto, var indirectBufferAuto) = gd.BufferManager.GetBufferTopologyConversionIndirect(
                 gd,
                 cbs,
-                new GAL.BufferRange(_handle, _offset, _size),
+                new BufferRange(_handle, _offset, _size),
                 indirectBuffer,
                 drawCountBuffer,
                 pattern,
@@ -132,7 +133,7 @@ namespace Ryujinx.Graphics.Vulkan
             return indirectBufferAuto;
         }
 
-        private int GetIndexSize()
+        private readonly int GetIndexSize()
         {
             return _type switch
             {
@@ -142,7 +143,7 @@ namespace Ryujinx.Graphics.Vulkan
             };
         }
 
-        public bool BoundEquals(Auto<DisposableBuffer> buffer)
+        public readonly bool BoundEquals(Auto<DisposableBuffer> buffer)
         {
             return _buffer == buffer;
         }
-- 
cgit v1.2.3