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/Effects | |
| 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/Effects')
6 files changed, 31 insertions, 26 deletions
diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/FsrScalingFilter.cs b/src/Ryujinx.Graphics.Vulkan/Effects/FsrScalingFilter.cs index 7317b567..89a43b12 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/FsrScalingFilter.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/FsrScalingFilter.cs @@ -5,10 +5,12 @@ using Ryujinx.Graphics.Shader.Translation; using Silk.NET.Vulkan; using System; using Extent2D = Ryujinx.Graphics.GAL.Extents2D; +using Format = Silk.NET.Vulkan.Format; +using SamplerCreateInfo = Ryujinx.Graphics.GAL.SamplerCreateInfo; namespace Ryujinx.Graphics.Vulkan.Effects { - internal partial class FsrScalingFilter : IScalingFilter + internal class FsrScalingFilter : IScalingFilter { private readonly VulkanRenderer _renderer; private PipelineHelperShader _pipeline; @@ -66,16 +68,16 @@ namespace Ryujinx.Graphics.Vulkan.Effects .Add(ResourceStages.Compute, ResourceType.TextureAndSampler, 1) .Add(ResourceStages.Compute, ResourceType.Image, 0).Build(); - _sampler = _renderer.CreateSampler(GAL.SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear)); + _sampler = _renderer.CreateSampler(SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear)); _scalingProgram = _renderer.CreateProgramWithMinimalLayout(new[] { - new ShaderSource(scalingShader, ShaderStage.Compute, TargetLanguage.Spirv) + new ShaderSource(scalingShader, ShaderStage.Compute, TargetLanguage.Spirv), }, scalingResourceLayout); _sharpeningProgram = _renderer.CreateProgramWithMinimalLayout(new[] { - new ShaderSource(sharpeningShader, ShaderStage.Compute, TargetLanguage.Spirv) + new ShaderSource(sharpeningShader, ShaderStage.Compute, TargetLanguage.Spirv), }, sharpeningResourceLayout); } @@ -83,7 +85,7 @@ namespace Ryujinx.Graphics.Vulkan.Effects TextureView view, CommandBufferScoped cbs, Auto<DisposableImageView> destinationTexture, - Silk.NET.Vulkan.Format format, + Format format, int width, int height, Extent2D source, @@ -136,14 +138,14 @@ namespace Ryujinx.Graphics.Vulkan.Effects destination.Y1, destination.Y2, scaleX, - scaleY + scaleY, }; int rangeSize = dimensionsBuffer.Length * sizeof(float); var bufferHandle = _renderer.BufferManager.CreateWithHandle(_renderer, rangeSize); _renderer.BufferManager.SetData(bufferHandle, 0, dimensionsBuffer); - ReadOnlySpan<float> sharpeningBuffer = stackalloc float[] { 1.5f - (Level * 0.01f * 1.5f)}; + ReadOnlySpan<float> sharpeningBuffer = stackalloc float[] { 1.5f - (Level * 0.01f * 1.5f) }; var sharpeningBufferHandle = _renderer.BufferManager.CreateWithHandle(_renderer, sizeof(float)); _renderer.BufferManager.SetData(sharpeningBufferHandle, 0, sharpeningBuffer); @@ -172,4 +174,4 @@ namespace Ryujinx.Graphics.Vulkan.Effects _renderer.BufferManager.Delete(sharpeningBufferHandle); } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/FxaaPostProcessingEffect.cs b/src/Ryujinx.Graphics.Vulkan/Effects/FxaaPostProcessingEffect.cs index 3c3516bb..2dd99180 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/FxaaPostProcessingEffect.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/FxaaPostProcessingEffect.cs @@ -4,16 +4,17 @@ using Ryujinx.Graphics.Shader; using Ryujinx.Graphics.Shader.Translation; using Silk.NET.Vulkan; using System; +using SamplerCreateInfo = Ryujinx.Graphics.GAL.SamplerCreateInfo; namespace Ryujinx.Graphics.Vulkan.Effects { - internal partial class FxaaPostProcessingEffect : IPostProcessingEffect + internal class FxaaPostProcessingEffect : IPostProcessingEffect { private readonly VulkanRenderer _renderer; private ISampler _samplerLinear; private ShaderCollection _shaderProgram; - private PipelineHelperShader _pipeline; + private readonly PipelineHelperShader _pipeline; private TextureView _texture; public FxaaPostProcessingEffect(VulkanRenderer renderer, Device device) @@ -43,11 +44,11 @@ namespace Ryujinx.Graphics.Vulkan.Effects .Add(ResourceStages.Compute, ResourceType.TextureAndSampler, 1) .Add(ResourceStages.Compute, ResourceType.Image, 0).Build(); - _samplerLinear = _renderer.CreateSampler(GAL.SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear)); + _samplerLinear = _renderer.CreateSampler(SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear)); _shaderProgram = _renderer.CreateProgramWithMinimalLayout(new[] { - new ShaderSource(shader, ShaderStage.Compute, TargetLanguage.Spirv) + new ShaderSource(shader, ShaderStage.Compute, TargetLanguage.Spirv), }, resourceLayout); } @@ -86,4 +87,4 @@ namespace Ryujinx.Graphics.Vulkan.Effects return _texture; } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/IPostProcessingEffect.cs b/src/Ryujinx.Graphics.Vulkan/Effects/IPostProcessingEffect.cs index d36cf01d..d13641c6 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/IPostProcessingEffect.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/IPostProcessingEffect.cs @@ -7,4 +7,4 @@ namespace Ryujinx.Graphics.Vulkan.Effects const int LocalGroupSize = 64; TextureView Run(TextureView view, CommandBufferScoped cbs, int width, int height); } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/IScalingFilter.cs b/src/Ryujinx.Graphics.Vulkan/Effects/IScalingFilter.cs index 54f809d7..50fc3710 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/IScalingFilter.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/IScalingFilter.cs @@ -17,4 +17,4 @@ namespace Ryujinx.Graphics.Vulkan.Effects Extent2D source, Extent2D destination); } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/SmaaConstants.cs b/src/Ryujinx.Graphics.Vulkan/Effects/SmaaConstants.cs index a5f060f1..0383ab23 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/SmaaConstants.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/SmaaConstants.cs @@ -12,4 +12,4 @@ namespace Ryujinx.Graphics.Vulkan.Effects public float Width; public float Height; } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs b/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs index f6de3ac2..40ab245e 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/SmaaPostProcessingEffect.cs @@ -4,10 +4,12 @@ using Ryujinx.Graphics.Shader; using Ryujinx.Graphics.Shader.Translation; using Silk.NET.Vulkan; using System; +using Format = Ryujinx.Graphics.GAL.Format; +using SamplerCreateInfo = Ryujinx.Graphics.GAL.SamplerCreateInfo; namespace Ryujinx.Graphics.Vulkan.Effects { - internal partial class SmaaPostProcessingEffect : IPostProcessingEffect + internal class SmaaPostProcessingEffect : IPostProcessingEffect { public const int AreaWidth = 160; public const int AreaHeight = 560; @@ -63,7 +65,7 @@ namespace Ryujinx.Graphics.Vulkan.Effects _searchTexture?.Dispose(); } - private unsafe void RecreateShaders(int width, int height) + private void RecreateShaders(int width, int height) { _recreatePipelines = false; @@ -94,9 +96,9 @@ namespace Ryujinx.Graphics.Vulkan.Effects .Add(ResourceStages.Compute, ResourceType.TextureAndSampler, 3) .Add(ResourceStages.Compute, ResourceType.Image, 0).Build(); - _samplerLinear = _renderer.CreateSampler(GAL.SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear)); + _samplerLinear = _renderer.CreateSampler(SamplerCreateInfo.Create(MinFilter.Linear, MagFilter.Linear)); - _specConstants = new SmaaConstants() + _specConstants = new SmaaConstants { Width = width, Height = height, @@ -116,17 +118,17 @@ namespace Ryujinx.Graphics.Vulkan.Effects _edgeProgram = _renderer.CreateProgramWithMinimalLayout(new[] { - new ShaderSource(edgeShader, ShaderStage.Compute, TargetLanguage.Spirv) + new ShaderSource(edgeShader, ShaderStage.Compute, TargetLanguage.Spirv), }, edgeResourceLayout, new[] { specInfo }); _blendProgram = _renderer.CreateProgramWithMinimalLayout(new[] { - new ShaderSource(blendShader, ShaderStage.Compute, TargetLanguage.Spirv) + new ShaderSource(blendShader, ShaderStage.Compute, TargetLanguage.Spirv), }, blendResourceLayout, new[] { specInfo }); _neighbourProgram = _renderer.CreateProgramWithMinimalLayout(new[] { - new ShaderSource(neighbourShader, ShaderStage.Compute, TargetLanguage.Spirv) + new ShaderSource(neighbourShader, ShaderStage.Compute, TargetLanguage.Spirv), }, neighbourResourceLayout, new[] { specInfo }); } @@ -148,7 +150,7 @@ namespace Ryujinx.Graphics.Vulkan.Effects 1, 1, 1, - GAL.Format.R8G8Unorm, + Format.R8G8Unorm, DepthStencilMode.Depth, Target.Texture2D, SwizzleComponent.Red, @@ -164,7 +166,7 @@ namespace Ryujinx.Graphics.Vulkan.Effects 1, 1, 1, - GAL.Format.R8Unorm, + Format.R8Unorm, DepthStencilMode.Depth, Target.Texture2D, SwizzleComponent.Red, @@ -264,4 +266,4 @@ namespace Ryujinx.Graphics.Vulkan.Effects _pipeline.ClearRenderTargetColor(0, 0, 1, new ColorF(0f, 0f, 0f, 1f)); } } -}
\ No newline at end of file +} |
