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/VulkanDebugMessenger.cs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/src/Ryujinx.Graphics.Vulkan/VulkanDebugMessenger.cs b/src/Ryujinx.Graphics.Vulkan/VulkanDebugMessenger.cs
index 7e39a251..82e30f5b 100644
--- a/src/Ryujinx.Graphics.Vulkan/VulkanDebugMessenger.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VulkanDebugMessenger.cs
@@ -10,8 +10,7 @@ namespace Ryujinx.Graphics.Vulkan
 {
     class VulkanDebugMessenger : IDisposable
     {
-        private static string[] _excludedMessages = new string[]
-        {
+        private static readonly string[] _excludedMessages = {
             // NOTE: Done on purpose right now.
             "UNASSIGNED-CoreValidation-Shader-OutputNotConsumed",
             // TODO: Figure out if fixable
@@ -19,7 +18,7 @@ namespace Ryujinx.Graphics.Vulkan
             // TODO: Might be worth looking into making this happy to possibly optimize copies.
             "UNASSIGNED-CoreValidation-DrawState-InvalidImageLayout",
             // TODO: Fix this, it's causing too much noise right now.
-            "VUID-VkSubpassDependency-srcSubpass-00867"
+            "VUID-VkSubpassDependency-srcSubpass-00867",
         };
 
         private readonly Vk _api;
@@ -48,7 +47,7 @@ namespace Ryujinx.Graphics.Vulkan
         private Result TryInitialize(out DebugUtilsMessengerEXT? debugUtilsMessengerHandle)
         {
             debugUtilsMessengerHandle = null;
-            
+
             if (_debugUtils != null && _logLevel != GraphicsDebugLevel.None)
             {
                 var messageType = _logLevel switch
@@ -59,7 +58,7 @@ namespace Ryujinx.Graphics.Vulkan
                     GraphicsDebugLevel.All => DebugUtilsMessageTypeFlagsEXT.GeneralBitExt |
                                               DebugUtilsMessageTypeFlagsEXT.ValidationBitExt |
                                               DebugUtilsMessageTypeFlagsEXT.PerformanceBitExt,
-                    _ => throw new ArgumentException($"Invalid log level \"{_logLevel}\".")
+                    _ => throw new ArgumentException($"Invalid log level \"{_logLevel}\"."),
                 };
 
                 var messageSeverity = _logLevel switch
@@ -71,14 +70,14 @@ namespace Ryujinx.Graphics.Vulkan
                                               DebugUtilsMessageSeverityFlagsEXT.WarningBitExt |
                                               DebugUtilsMessageSeverityFlagsEXT.VerboseBitExt |
                                               DebugUtilsMessageSeverityFlagsEXT.ErrorBitExt,
-                    _ => throw new ArgumentException($"Invalid log level \"{_logLevel}\".")
+                    _ => throw new ArgumentException($"Invalid log level \"{_logLevel}\"."),
                 };
 
-                var debugUtilsMessengerCreateInfo = new DebugUtilsMessengerCreateInfoEXT()
+                var debugUtilsMessengerCreateInfo = new DebugUtilsMessengerCreateInfoEXT
                 {
                     SType = StructureType.DebugUtilsMessengerCreateInfoExt,
                     MessageType = messageType,
-                    MessageSeverity = messageSeverity
+                    MessageSeverity = messageSeverity,
                 };
 
                 unsafe
-- 
cgit v1.2.3