ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

GPU: move filtered sampler to fragui.glsl, delete fragui_bicubic.glsl, add documentation

Browse Source
This commit is contained in:
logarithm
2019-11-28 20:31:50 +02:00
parent de485f2010
commit 9022b4f65e
4 changed files with 95 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
View File

@@ -146,10 +146,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int glUiVertexShader;
private int glUiFragmentShader;
private int glUiBicubicProgram;
private int glUiBicubicVertexShader;
private int glUiBicubicFragmentShader;
private int vaoUiHandle;
private int vboUiHandle;
@@ -223,7 +219,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int uniProjectionMatrix;
private int uniBrightness;
private int uniTex;
private int uniTexBicubic;
private int uniTexSamplingMode;
private int uniTextures;
private int uniTextureOffsets;
private int uniBlockSmall;
@@ -510,15 +506,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
null,
inputStreamToString(getClass().getResourceAsStream("fragui.glsl")));
glUiBicubicProgram = gl.glCreateProgram();
glUiBicubicVertexShader = gl.glCreateShader(gl.GL_VERTEX_SHADER);
glUiBicubicFragmentShader = gl.glCreateShader(gl.GL_FRAGMENT_SHADER);
GLUtil.loadShaders(gl, glUiBicubicProgram, glUiBicubicVertexShader, -1, glUiBicubicFragmentShader,
inputStreamToString(getClass().getResourceAsStream("vertui.glsl")),
null,
inputStreamToString(getClass().getResourceAsStream("fragui_bicubic.glsl")));
initUniforms();
}
@@ -533,7 +520,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
uniDrawDistance = gl.glGetUniformLocation(glProgram, "drawDistance");
uniTex = gl.glGetUniformLocation(glUiProgram, "tex");
uniTexBicubic = gl.glGetUniformLocation(glUiBicubicProgram, "tex");
uniTexSamplingMode = gl.glGetUniformLocation(glUiProgram, "samplingMode");
uniTextures = gl.glGetUniformLocation(glProgram, "textures");
uniTextureOffsets = gl.glGetUniformLocation(glProgram, "textureOffsets");
@@ -586,9 +573,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glDeleteProgram(glUiProgram);
glUiProgram = -1;
gl.glDeleteProgram(glUiBicubicProgram);
glUiBicubicProgram = -1;
}
private void initVao()
@@ -1182,18 +1166,10 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
glDpiAwareViewport(0, 0, canvasWidth, canvasHeight);
}
if (client.isStretchedEnabled() && config.uiScalingMode() == UIScalingMode.CATMULL_ROM)
{
// Use the texture bound in the first pass
gl.glUseProgram(glUiBicubicProgram);
gl.glUniform1i(uniTexBicubic, 0);
}
else
{
// Use the texture bound in the first pass
gl.glUseProgram(glUiProgram);
gl.glUniform1i(uniTex, 0);
}
// Use the texture bound in the first pass
gl.glUseProgram(glUiProgram);
gl.glUniform1i(uniTex, 0);
gl.glUniform1i(uniTexSamplingMode, config.uiScalingMode().getMode());
// Set the sampling function used when stretching the UI.
// This is probably better done with sampler objects instead of texture parameters, but this is easier and likely more portable.

7
runelite-client/src/main/java/net/runelite/client/plugins/gpu/config/UIScalingMode.java
View File

@@ -31,11 +31,12 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum UIScalingMode
{
NEAREST("Nearest Neighbor"),
LINEAR("Bilinear"),
CATMULL_ROM("Bicubic (Catmull-Rom)");
NEAREST("Nearest Neighbor", 0),
LINEAR("Bilinear", 0),
CATMULL_ROM("Bicubic (Catmull-Rom)", 1);
private final String name;
private final int mode;
@Override
public String toString()