From 69ea40f1d62d330226fa3338818ecf4d7d1d3b47 Mon Sep 17 00:00:00 2001
From: ZenoArrows <129334871+ZenoArrows@users.noreply.github.com>
Date: Wed, 11 Sep 2024 12:33:00 +0200
Subject: [PATCH] AreaScaling: Delete unused scaleX/scaleY uniforms.

---
 .../Effects/AreaScalingFilter.cs              |  10 ----------
 .../Effects/Shaders/area_scaling.glsl         |   2 --
 .../Effects/AreaScalingFilter.cs              |   7 -------
 .../Effects/Shaders/AreaScaling.glsl          |   2 --
 .../Effects/Shaders/AreaScaling.spv           | Bin 12380 -> 12292 bytes
 5 files changed, 21 deletions(-)

diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs b/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs
index 7153b393e..9b19f2f26 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs
@@ -21,8 +21,6 @@ namespace Ryujinx.Graphics.OpenGL.Effects
         private int _dstX1Uniform;
         private int _dstY0Uniform;
         private int _dstY1Uniform;
-        private int _scaleXUniform;
-        private int _scaleYUniform;
 
         public float Level { get; set; }
 
@@ -58,8 +56,6 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             _dstX1Uniform = GL.GetUniformLocation(_scalingShaderProgram, "dstX1");
             _dstY0Uniform = GL.GetUniformLocation(_scalingShaderProgram, "dstY0");
             _dstY1Uniform = GL.GetUniformLocation(_scalingShaderProgram, "dstY1");
-            _scaleXUniform = GL.GetUniformLocation(_scalingShaderProgram, "scaleX");
-            _scaleYUniform = GL.GetUniformLocation(_scalingShaderProgram, "scaleY");
         }
 
         public void Run(
@@ -82,10 +78,6 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             int dispatchY = (height + (threadGroupWorkRegionDim - 1)) / threadGroupWorkRegionDim;
 
             // Scaling pass
-            float srcWidth = Math.Abs(source.X2 - source.X1);
-            float srcHeight = Math.Abs(source.Y2 - source.Y1);
-            float scaleX = srcWidth / view.Width;
-            float scaleY = srcHeight / view.Height;
             GL.UseProgram(_scalingShaderProgram);
             view.Bind(0);
             GL.Uniform1(_inputUniform, 0);
@@ -98,8 +90,6 @@ namespace Ryujinx.Graphics.OpenGL.Effects
             GL.Uniform1(_dstX1Uniform, (float)destination.X2);
             GL.Uniform1(_dstY0Uniform, (float)destination.Y1);
             GL.Uniform1(_dstY1Uniform, (float)destination.Y2);
-            GL.Uniform1(_scaleXUniform, scaleX);
-            GL.Uniform1(_scaleYUniform, scaleY);
             GL.DispatchCompute(dispatchX, dispatchY, 1);
 
             GL.UseProgram(previousProgram);
diff --git a/src/Ryujinx.Graphics.OpenGL/Effects/Shaders/area_scaling.glsl b/src/Ryujinx.Graphics.OpenGL/Effects/Shaders/area_scaling.glsl
index 273c64fd9..951bdccbe 100644
--- a/src/Ryujinx.Graphics.OpenGL/Effects/Shaders/area_scaling.glsl
+++ b/src/Ryujinx.Graphics.OpenGL/Effects/Shaders/area_scaling.glsl
@@ -11,8 +11,6 @@ layout( location=6 ) uniform float dstX0;
 layout( location=7 ) uniform float dstX1;
 layout( location=8 ) uniform float dstY0;
 layout( location=9 ) uniform float dstY1;
-layout( location=10 ) uniform float scaleX;
-layout( location=11 ) uniform float scaleY;
 
 /***** Area Sampling *****/
 
diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs b/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs
index a6d3e8606..106b738f0 100644
--- a/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs
@@ -70,11 +70,6 @@ namespace Ryujinx.Graphics.Vulkan.Effects
             _pipeline.SetProgram(_scalingProgram);
             _pipeline.SetTextureAndSampler(ShaderStage.Compute, 1, view, _sampler);
 
-            float srcWidth = Math.Abs(source.X2 - source.X1);
-            float srcHeight = Math.Abs(source.Y2 - source.Y1);
-            float scaleX = srcWidth / view.Width;
-            float scaleY = srcHeight / view.Height;
-
             ReadOnlySpan<float> dimensionsBuffer = stackalloc float[]
             {
                 source.X1,
@@ -85,8 +80,6 @@ namespace Ryujinx.Graphics.Vulkan.Effects
                 destination.X2,
                 destination.Y1,
                 destination.Y2,
-                scaleX,
-                scaleY,
             };
 
             int rangeSize = dimensionsBuffer.Length * sizeof(float);
diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.glsl b/src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.glsl
index eb3290cec..98719722c 100644
--- a/src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.glsl
+++ b/src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.glsl
@@ -13,8 +13,6 @@ layout( binding = 2 ) uniform dimensions{
  float dstX1;
  float dstY0;
  float dstY1;
- float scaleX;
- float scaleY;
 };
 
 /***** Area Sampling *****/
diff --git a/src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.spv b/src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.spv
index a06e753781bab748c7299ea21c87f1a84638251d..2fc7d7894c6bac1570d9dd38de827064f0f0396f 100644
GIT binary patch
delta 26
icmcbU(2}shf@yOClLzzW3#?*{%v=nTn?JH;YXSg(aR_bz

delta 115
zcmZokxRbEKf=P{yft5j$fq{Voh>MdGb5bK17+_+YFtNzZW=vkpsvbycm4R{!KnxQD
isRfCtY_4UMWMt-Hkes}bO?vVMHXa~m*}R9%LlXcA$r57#