ShuriZma
/
Ryujinx
mirror of https://github.com/Ryujinx/Ryujinx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AreaScaling: Delete unused scaleX/scaleY uniforms.

This commit is contained in:
ZenoArrows 2024-09-11 12:33:00 +02:00
parent bc86c9cf22
commit 69ea40f1d6
5 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ryujinx.Graphics.OpenGL/Effects/AreaScalingFilter.cs
View File

@ -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);

2
src/Ryujinx.Graphics.OpenGL/Effects/Shaders/area_scaling.glsl
View File

@ -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 *****/

7
src/Ryujinx.Graphics.Vulkan/Effects/AreaScalingFilter.cs
View File

@ -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);

2
src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.glsl
View File

@ -13,8 +13,6 @@ layout( binding = 2 ) uniform dimensions{
float dstX1;
float dstY0;
float dstY1;
float scaleX;
float scaleY;
};
/***** Area Sampling *****/

BIN
src/Ryujinx.Graphics.Vulkan/Effects/Shaders/AreaScaling.spv
View File

Binary file not shown.