diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-07-01 12:31:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 12:31:42 +0200 |
| commit | 801b71a12883f8a104c699a92a9aa997e2a6d609 (patch) | |
| tree | 65a93c437abe7f598726e2654103ebfa0e62f477 /src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs | |
| parent | 12c5f6ee89a2e93814d144a2c92acbf3f8a4788f (diff) | |
[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
Diffstat (limited to 'src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs b/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs index a52b4462..7c1ddef8 100644 --- a/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs +++ b/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs @@ -2,6 +2,8 @@ using Ryujinx.Graphics.GAL; using Silk.NET.Vulkan; using System; +using Format = Silk.NET.Vulkan.Format; +using PolygonMode = Silk.NET.Vulkan.PolygonMode; namespace Ryujinx.Graphics.Vulkan { @@ -16,15 +18,15 @@ namespace Ryujinx.Graphics.Vulkan AttachmentDescription[] attachmentDescs = null; - var subpass = new SubpassDescription() + var subpass = new SubpassDescription { - PipelineBindPoint = PipelineBindPoint.Graphics + PipelineBindPoint = PipelineBindPoint.Graphics, }; AttachmentReference* attachmentReferences = stackalloc AttachmentReference[MaxAttachments]; Span<int> attachmentIndices = stackalloc int[MaxAttachments]; - Span<Silk.NET.Vulkan.Format> attachmentFormats = stackalloc Silk.NET.Vulkan.Format[MaxAttachments]; + Span<Format> attachmentFormats = stackalloc Format[MaxAttachments]; int attachmentCount = 0; int colorCount = 0; @@ -106,7 +108,7 @@ namespace Ryujinx.Graphics.Vulkan fixed (AttachmentDescription* pAttachmentDescs = attachmentDescs) { - var renderPassCreateInfo = new RenderPassCreateInfo() + var renderPassCreateInfo = new RenderPassCreateInfo { SType = StructureType.RenderPassCreateInfo, PAttachments = pAttachmentDescs, @@ -114,7 +116,7 @@ namespace Ryujinx.Graphics.Vulkan PSubpasses = &subpass, SubpassCount = 1, PDependencies = &subpassDependency, - DependencyCount = 1 + DependencyCount = 1, }; gd.Api.CreateRenderPass(device, renderPassCreateInfo, null, out var renderPass).ThrowOnError(); @@ -151,7 +153,7 @@ namespace Ryujinx.Graphics.Vulkan public static PipelineState ToVulkanPipelineState(this ProgramPipelineState state, VulkanRenderer gd) { - PipelineState pipeline = new PipelineState(); + PipelineState pipeline = new(); pipeline.Initialize(); // It is assumed that Dynamic State is enabled when this conversion is used. @@ -178,7 +180,7 @@ namespace Ryujinx.Graphics.Vulkan pipeline.MaxDepthBounds = 0f; // Not implemented. pipeline.PatchControlPoints = state.PatchControlPoints; - pipeline.PolygonMode = Silk.NET.Vulkan.PolygonMode.Fill; // Not implemented. + pipeline.PolygonMode = PolygonMode.Fill; // Not implemented. pipeline.PrimitiveRestartEnable = state.PrimitiveRestartEnable; pipeline.RasterizerDiscardEnable = state.RasterizerDiscard; pipeline.SamplesCount = (uint)state.SamplesCount; |
