From bc86c9cf225bf1e495eaf553a00fd8164152b35d Mon Sep 17 00:00:00 2001 From: ZenoArrows <129334871+ZenoArrows@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:26:01 +0200 Subject: [PATCH] AreaScaling: Delete unused sharpening level member. Also rename _scale to _sharpeningLevel for clarity and consistency. --- .../Effects/AreaScalingFilter.cs | 10 +--------- .../Effects/FsrScalingFilter.cs | 6 +++--- .../Effects/AreaScalingFilter.cs | 10 +--------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs b/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs index cc4594298..7153b393e 100644 --- a/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs +++ b/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs @@ -16,7 +16,6 @@ namespace Ryujinx.Graphics.OpenGL.Effects private int _srcX1Uniform; private int _srcY0Uniform; private int _scalingShaderProgram; - private float _scale = 1; private int _srcY1Uniform; private int _dstX0Uniform; private int _dstX1Uniform; @@ -25,14 +24,7 @@ namespace Ryujinx.Graphics.OpenGL.Effects private int _scaleXUniform; private int _scaleYUniform; - public float Level - { - get => _scale; - set - { - _scale = MathF.Max(0.01f, value); - } - } + public float Level { get; set; } public AreaScalingFilter(OpenGLRenderer renderer) { diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs b/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs index 1a130bebb..0522e28e0 100644 --- a/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs +++ b/src/Ryujinx.Graphics.OpenGL/Effects/FsrScalingFilter.cs @@ -18,7 +18,7 @@ namespace Ryujinx.Graphics.OpenGL.Effects private int _srcY0Uniform; private int _scalingShaderProgram; private int _sharpeningShaderProgram; - private float _scale = 1; + private float _sharpeningLevel = 1; private int _srcY1Uniform; private int _dstX0Uniform; private int _dstX1Uniform; @@ -30,10 +30,10 @@ namespace Ryujinx.Graphics.OpenGL.Effects public float Level { - get => _scale; + get => _sharpeningLevel; set { - _scale = MathF.Max(0.01f, value); + _sharpeningLevel = MathF.Max(0.01f, value); } } diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs b/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs index eb9ba27bc..a6d3e8606 100644 --- a/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs +++ b/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs @@ -16,17 +16,9 @@ namespace Ryujinx.Graphics.Vulkan.Effects private PipelineHelperShader _pipeline; private ISampler _sampler; private ShaderCollection _scalingProgram; - private float _sharpeningLevel = 1; private Device _device; - public float Level - { - get => _sharpeningLevel; - set - { - _sharpeningLevel = MathF.Max(0.01f, value); - } - } + public float Level { get; set; } public AreaScalingFilter(VulkanRenderer renderer, Device device) {