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/SamplerHolder.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/SamplerHolder.cs')
| -rw-r--r-- | src/Ryujinx.Graphics.Vulkan/SamplerHolder.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/SamplerHolder.cs b/src/Ryujinx.Graphics.Vulkan/SamplerHolder.cs index a95e4dba..6e9f408f 100644 --- a/src/Ryujinx.Graphics.Vulkan/SamplerHolder.cs +++ b/src/Ryujinx.Graphics.Vulkan/SamplerHolder.cs @@ -1,5 +1,6 @@ using Ryujinx.Graphics.GAL; using Silk.NET.Vulkan; +using SamplerCreateInfo = Ryujinx.Graphics.GAL.SamplerCreateInfo; namespace Ryujinx.Graphics.Vulkan { @@ -8,13 +9,13 @@ namespace Ryujinx.Graphics.Vulkan private readonly VulkanRenderer _gd; private readonly Auto<DisposableSampler> _sampler; - public unsafe SamplerHolder(VulkanRenderer gd, Device device, GAL.SamplerCreateInfo info) + public unsafe SamplerHolder(VulkanRenderer gd, Device device, SamplerCreateInfo info) { _gd = gd; gd.Samplers.Add(this); - (Filter minFilter, SamplerMipmapMode mipFilter) = EnumConversion.Convert(info.MinFilter); + (Filter minFilter, SamplerMipmapMode mipFilter) = info.MinFilter.Convert(); float minLod = info.MinLod; float maxLod = info.MaxLod; @@ -27,7 +28,7 @@ namespace Ryujinx.Graphics.Vulkan var borderColor = GetConstrainedBorderColor(info.BorderColor, out var cantConstrain); - var samplerCreateInfo = new Silk.NET.Vulkan.SamplerCreateInfo() + var samplerCreateInfo = new Silk.NET.Vulkan.SamplerCreateInfo { SType = StructureType.SamplerCreateInfo, MagFilter = info.MagFilter.Convert(), @@ -44,7 +45,7 @@ namespace Ryujinx.Graphics.Vulkan MinLod = minLod, MaxLod = maxLod, BorderColor = borderColor, - UnnormalizedCoordinates = false // TODO: Use unnormalized coordinates. + UnnormalizedCoordinates = false, // TODO: Use unnormalized coordinates. }; SamplerCustomBorderColorCreateInfoEXT customBorderColor; @@ -57,10 +58,10 @@ namespace Ryujinx.Graphics.Vulkan info.BorderColor.Blue, info.BorderColor.Alpha); - customBorderColor = new SamplerCustomBorderColorCreateInfoEXT() + customBorderColor = new SamplerCustomBorderColorCreateInfoEXT { SType = StructureType.SamplerCustomBorderColorCreateInfoExt, - CustomBorderColor = color + CustomBorderColor = color, }; samplerCreateInfo.PNext = &customBorderColor; @@ -86,7 +87,8 @@ namespace Ryujinx.Graphics.Vulkan cantConstrain = false; return BorderColor.FloatOpaqueBlack; } - else if (a == 0f) + + if (a == 0f) { cantConstrain = false; return BorderColor.FloatTransparentBlack; |
