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

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

diff --git a/src/Ryujinx.Graphics.Vulkan/DescriptorSetCollection.cs b/src/Ryujinx.Graphics.Vulkan/DescriptorSetCollection.cs
index a185d787..846dd5c7 100644
--- a/src/Ryujinx.Graphics.Vulkan/DescriptorSetCollection.cs
+++ b/src/Ryujinx.Graphics.Vulkan/DescriptorSetCollection.cs
@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Vulkan
     {
         private DescriptorSetManager.DescriptorPoolHolder _holder;
         private readonly DescriptorSet[] _descriptorSets;
-        public int SetsCount => _descriptorSets.Length;
+        public readonly int SetsCount => _descriptorSets.Length;
 
         public DescriptorSetCollection(DescriptorSetManager.DescriptorPoolHolder holder, DescriptorSet[] descriptorSets)
         {
@@ -20,10 +20,10 @@ namespace Ryujinx.Graphics.Vulkan
         {
             Span<DescriptorBufferInfo> infos = stackalloc DescriptorBufferInfo[count];
 
-            infos.Fill(new DescriptorBufferInfo()
+            infos.Fill(new DescriptorBufferInfo
             {
                 Buffer = dummyBuffer,
-                Range = Vk.WholeSize
+                Range = Vk.WholeSize,
             });
 
             UpdateBuffers(setIndex, baseBinding, infos, type);
@@ -40,7 +40,7 @@ namespace Ryujinx.Graphics.Vulkan
                     DstBinding = (uint)bindingIndex,
                     DescriptorType = type,
                     DescriptorCount = 1,
-                    PBufferInfo = &bufferInfo
+                    PBufferInfo = &bufferInfo,
                 };
 
                 _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -63,7 +63,7 @@ namespace Ryujinx.Graphics.Vulkan
                     DstBinding = (uint)baseBinding,
                     DescriptorType = type,
                     DescriptorCount = (uint)bufferInfo.Length,
-                    PBufferInfo = pBufferInfo
+                    PBufferInfo = pBufferInfo,
                 };
 
                 _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -81,7 +81,7 @@ namespace Ryujinx.Graphics.Vulkan
                     DstBinding = (uint)bindingIndex,
                     DescriptorType = type,
                     DescriptorCount = 1,
-                    PImageInfo = &imageInfo
+                    PImageInfo = &imageInfo,
                 };
 
                 _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -104,7 +104,7 @@ namespace Ryujinx.Graphics.Vulkan
                     DstBinding = (uint)baseBinding,
                     DescriptorType = type,
                     DescriptorCount = (uint)imageInfo.Length,
-                    PImageInfo = pImageInfo
+                    PImageInfo = pImageInfo,
                 };
 
                 _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -141,7 +141,7 @@ namespace Ryujinx.Graphics.Vulkan
                             DstBinding = (uint)(baseBinding + i),
                             DescriptorType = DescriptorType.CombinedImageSampler,
                             DescriptorCount = (uint)count,
-                            PImageInfo = pImageInfo
+                            PImageInfo = pImageInfo,
                         };
 
                         _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -163,7 +163,7 @@ namespace Ryujinx.Graphics.Vulkan
                     DstBinding = (uint)bindingIndex,
                     DescriptorType = type,
                     DescriptorCount = 1,
-                    PTexelBufferView = &texelBufferView
+                    PTexelBufferView = &texelBufferView,
                 };
 
                 _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -197,7 +197,7 @@ namespace Ryujinx.Graphics.Vulkan
                             DstBinding = (uint)baseBinding + i,
                             DescriptorType = type,
                             DescriptorCount = count,
-                            PTexelBufferView = pTexelBufferView + i
+                            PTexelBufferView = pTexelBufferView + i,
                         };
 
                         _holder.Api.UpdateDescriptorSets(_holder.Device, 1, writeDescriptorSet, 0, null);
@@ -208,7 +208,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        public DescriptorSet[] GetSets()
+        public readonly DescriptorSet[] GetSets()
         {
             return _descriptorSets;
         }
-- 
cgit v1.2.3