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

Merge pull request #6639 from dbolya/GPU_UI_Scaling

Browse Source 
Add UI scaling when using GPU with stretched mode.
This commit is contained in:
Adam
2018-11-26 19:55:54 -05:00
committed by GitHub
parent 6615ac2827 e1b31c40e7
commit c9713b080d
3 changed files with 217 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,14 +72,12 @@ import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginInstantiationException;
import net.runelite.client.plugins.PluginManager;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteBuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteFrameBuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteRenderbuffers;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteTexture;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteVertexArrays;
import static net.runelite.client.plugins.gpu.GLUtil.glDeleteFrameBuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glGenBuffers;
import static net.runelite.client.plugins.gpu.GLUtil.glGenFrameBuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glGenRenderbuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glGenTexture;
import static net.runelite.client.plugins.gpu.GLUtil.glGenFrameBuffer;
import static net.runelite.client.plugins.gpu.GLUtil.glGenVertexArrays;
import static net.runelite.client.plugins.gpu.GLUtil.inputStreamToString;
import net.runelite.client.plugins.gpu.template.Template;
@@ -148,18 +146,21 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int glUiVertexShader;
private int glUiFragmentShader;
private int glUiPremulProgram;
private int glUiPremulVertexShader;
private int glUiPremulFragmentShader;
private int vaoUiHandle;
private int vboUiHandle;
private int fboUiHandle;
private int texUiHandle;
// scene vertex buffer id
private int bufferId;
// scene uv buffer id
private int uvBufferId;
private int fboStretchedHandle;
private int texStretchedHandle;
private int rboStretchedHandle;
private int textureArrayId;
private int uniformBufferId;
@@ -204,7 +205,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int lastViewportHeight;
private int lastCanvasWidth;
private int lastCanvasHeight;
private Dimension lastStretchedDimensions;
private int centerX;
private int centerY;
@@ -213,6 +213,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
private int uniProjectionMatrix;
private int uniBrightness;
private int uniTex;
private int uniTexPremul;
private int uniTextures;
private int uniTextureOffsets;
private int uniBlockSmall;
@@ -303,7 +304,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
client.resizeCanvas();
lastViewportWidth = lastViewportHeight = lastCanvasWidth = lastCanvasHeight = -1;
lastStretchedDimensions = null;
textureArrayId = -1;
@@ -375,7 +375,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
shutdownInterfaceTexture();
shutdownProgram();
shutdownVao();
shutdownStretchedFbo();
shutdownUiFBO();
}
if (jawtWindow != null)
@@ -464,6 +464,14 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
null,
inputStreamToString(getClass().getResourceAsStream("fragui.glsl")));
glUiPremulProgram = gl.glCreateProgram();
glUiPremulVertexShader = gl.glCreateShader(gl.GL_VERTEX_SHADER);
glUiPremulFragmentShader = gl.glCreateShader(gl.GL_FRAGMENT_SHADER);
GLUtil.loadShaders(gl, glUiPremulProgram, glUiPremulVertexShader, -1, glUiPremulFragmentShader,
inputStreamToString(getClass().getResourceAsStream("vertuipremul.glsl")),
null,
inputStreamToString(getClass().getResourceAsStream("fraguipremul.glsl")));
initUniforms();
}
@@ -474,6 +482,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
uniSmoothBanding = gl.glGetUniformLocation(glProgram, "smoothBanding");
uniTex = gl.glGetUniformLocation(glUiProgram, "tex");
uniTexPremul = gl.glGetUniformLocation(glUiPremulProgram, "tex");
uniTextures = gl.glGetUniformLocation(glProgram, "textures");
uniTextureOffsets = gl.glGetUniformLocation(glProgram, "textureOffsets");
@@ -526,6 +535,17 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glDeleteProgram(glUiProgram);
glUiProgram = -1;
///
gl.glDeleteShader(glUiPremulVertexShader);
glUiPremulVertexShader = -1;
gl.glDeleteShader(glUiPremulFragmentShader);
glUiPremulFragmentShader = -1;
gl.glDeleteProgram(glUiPremulProgram);
glUiPremulProgram = -1;
}
private void initVao()
@@ -611,50 +631,45 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glBindBuffer(gl.GL_UNIFORM_BUFFER, 0);
}
private void initStretchedFbo(int width, int height)
private void initUiFBO(int width, int height)
{
// Create and bind the FBO
fboStretchedHandle = glGenFrameBuffer(gl);
gl.glBindFramebuffer(gl.GL_FRAMEBUFFER, fboStretchedHandle);
fboUiHandle = glGenFrameBuffer(gl);
gl.glBindFramebuffer(gl.GL_FRAMEBUFFER, fboUiHandle);
// Create color render buffer
rboStretchedHandle = glGenRenderbuffer(gl);
gl.glBindRenderbuffer(gl.GL_RENDERBUFFER, rboStretchedHandle);
gl.glRenderbufferStorage(gl.GL_RENDERBUFFER, gl.GL_RGBA, width, height);
gl.glFramebufferRenderbuffer(gl.GL_FRAMEBUFFER, gl.GL_COLOR_ATTACHMENT0, gl.GL_RENDERBUFFER, rboStretchedHandle);
// Create texture
texStretchedHandle = glGenTexture(gl);
gl.glBindTexture(gl.GL_TEXTURE_2D, texStretchedHandle);
// Create the texture to render to
texUiHandle = glGenTexture(gl);
gl.glBindTexture(gl.GL_TEXTURE_2D, texUiHandle);
gl.glTexImage2D(gl.GL_TEXTURE_2D, 0, gl.GL_RGBA, width, height, 0, gl.GL_RGBA, gl.GL_UNSIGNED_BYTE, null);
// Bind texture
gl.glFramebufferTexture2D(gl.GL_FRAMEBUFFER, gl.GL_COLOR_ATTACHMENT0, gl.GL_TEXTURE_2D, texStretchedHandle, 0);
// Since this is an intermediate the same size as the input, just use nearest neighbors
gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MAG_FILTER, gl.GL_NEAREST);
gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MIN_FILTER, gl.GL_NEAREST);
// Attach the texture to the framebuffer
gl.glFramebufferTexture(gl.GL_FRAMEBUFFER, gl.GL_COLOR_ATTACHMENT0, texUiHandle, 0);
// Specify that we're going to draw onto color attachment 0
int drawLocations[] = { gl.GL_COLOR_ATTACHMENT0 };
gl.glDrawBuffers(1, drawLocations, 0);
// Reset
gl.glBindTexture(gl.GL_TEXTURE_2D, 0);
gl.glBindFramebuffer(gl.GL_FRAMEBUFFER, 0);
gl.glBindRenderbuffer(gl.GL_RENDERBUFFER, 0);
gl.glBindTexture(gl.GL_TEXTURE_2D, 0);
}
private void shutdownStretchedFbo()
private void shutdownUiFBO()
{
if (texStretchedHandle != -1)
if (fboUiHandle != -1)
{
glDeleteTexture(gl, texStretchedHandle);
texStretchedHandle = -1;
glDeleteFrameBuffer(gl, fboUiHandle);
fboUiHandle = -1;
}
if (fboStretchedHandle != -1)
if (texUiHandle != -1)
{
glDeleteFrameBuffer(gl, fboStretchedHandle);
fboStretchedHandle = -1;
}
if (rboStretchedHandle != -1)
{
glDeleteRenderbuffers(gl, rboStretchedHandle);
rboStretchedHandle = -1;
glDeleteTexture(gl, texUiHandle);
texUiHandle = -1;
}
}
@@ -775,26 +790,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
lastViewportHeight = viewportHeight;
}
// Initialize stretched mode and set draw frame buffer to the stretched fbo
if (client.isStretchedEnabled())
{
Dimension stretchedDimensions = client.getStretchedDimensions();
if (lastStretchedDimensions == null || !lastStretchedDimensions.equals(stretchedDimensions))
{
shutdownStretchedFbo();
initStretchedFbo(stretchedDimensions.width, stretchedDimensions.height);
lastStretchedDimensions = stretchedDimensions;
}
gl.glBindFramebuffer(gl.GL_DRAW_FRAMEBUFFER, fboStretchedHandle);
}
else if (lastStretchedDimensions != null)
{
shutdownStretchedFbo();
lastStretchedDimensions = null;
}
// Clear scene
gl.glClear(gl.GL_COLOR_BUFFER_BIT);
@@ -931,10 +926,33 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
}
final Texture[] textures = textureProvider.getTextures();
final int heightOff = client.getViewportYOffset();
final int widthOff = client.getViewportXOffset();
int renderHeightOff = client.getViewportYOffset();
int renderWidthOff = client.getViewportXOffset();
int renderCanvasHeight = canvasHeight;
int renderViewportHeight = viewportHeight;
int renderViewportWidth = viewportWidth;
gl.glViewport(widthOff, canvasHeight - viewportHeight - heightOff, viewportWidth, viewportHeight);
if (client.isStretchedEnabled())
{
Dimension dim = client.getStretchedDimensions();
renderCanvasHeight = dim.height;
double scaleFactorY = dim.getHeight() / canvasHeight;
double scaleFactorX = dim.getWidth() / canvasWidth;
// Pad the viewport a little because having ints for our viewport dimensions can introduce off-by-one errors.
final int padding = 1;
// Ceil the sizes because even if the size is 599.1 we want to treat it as size 600 (i.e. render to the x=599 pixel).
renderViewportHeight = (int) Math.ceil(scaleFactorY * (renderViewportHeight)) + padding * 2;
renderViewportWidth = (int) Math.ceil(scaleFactorX * (renderViewportWidth )) + padding * 2;
// Floor the offsets because even if the offset is 4.9, we want to render to the x=4 pixel anyway.
renderHeightOff = (int) Math.floor(scaleFactorY * (renderHeightOff)) - padding;
renderWidthOff = (int) Math.floor(scaleFactorX * (renderWidthOff )) - padding;
}
gl.glViewport(renderWidthOff, renderCanvasHeight - renderViewportHeight - renderHeightOff, renderViewportWidth, renderViewportHeight);
gl.glUseProgram(glProgram);
@@ -1010,21 +1028,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
// Texture on UI
drawUi(canvasHeight, canvasWidth);
// Output stretched frame
if (client.isStretchedEnabled())
{
Dimension stretchedDimensions = client.getStretchedDimensions();
gl.glBindFramebuffer(gl.GL_READ_FRAMEBUFFER, fboStretchedHandle);
gl.glBindFramebuffer(gl.GL_DRAW_FRAMEBUFFER, 0);
gl.glBlitFramebuffer(0, 0, canvasWidth, canvasHeight,
0, 0, stretchedDimensions.width, stretchedDimensions.height,
gl.GL_COLOR_BUFFER_BIT, client.isStretchedFast() ? gl.GL_NEAREST : gl.GL_LINEAR);
// Reset
gl.glBindFramebuffer(gl.GL_READ_FRAMEBUFFER, 0);
}
glDrawable.swapBuffers();
drawManager.processDrawComplete(this::screenshot);
@@ -1037,7 +1040,9 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
final int width = bufferProvider.getWidth();
final int height = bufferProvider.getHeight();
if (client.getGameState() == GameState.LOGGED_IN)
// Don't blend on the login screen because the fires overflow their alphas.
final GameState gameState = client.getGameState();
if (gameState == GameState.LOGGED_IN)
{
gl.glEnable(gl.GL_BLEND);
}
@@ -1046,8 +1051,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glDisable(gl.GL_BLEND);
}
gl.glViewport(0, 0, canvasWidth, canvasHeight);
vertexBuffer.clear(); // reuse vertex buffer for interface
vertexBuffer.ensureCapacity(pixels.length);
@@ -1063,19 +1066,73 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
gl.glTexImage2D(gl.GL_TEXTURE_2D, 0, gl.GL_RGBA, width, height, 0, gl.GL_BGRA, gl.GL_UNSIGNED_INT_8_8_8_8_REV, interfaceBuffer);
lastCanvasWidth = canvasWidth;
lastCanvasHeight = canvasHeight;
shutdownUiFBO();
initUiFBO(width, height);
}
else
{
gl.glTexSubImage2D(gl.GL_TEXTURE_2D, 0, 0, 0, width, height, gl.GL_BGRA, gl.GL_UNSIGNED_INT_8_8_8_8_REV, interfaceBuffer);
}
gl.glUseProgram(glUiProgram);
// First pass: pre-multiply alpha. But only do it if we're blending.
if (gameState == GameState.LOGGED_IN && client.isStretchedEnabled() && !client.isStretchedFast())
{
// Setup
gl.glDisable(gl.GL_BLEND);
gl.glBindFramebuffer(gl.GL_FRAMEBUFFER, fboUiHandle);
gl.glViewport(0, 0, width, height);
gl.glClear(gl.GL_COLOR_BUFFER_BIT);
// Bind texture to shader
gl.glActiveTexture(gl.GL_TEXTURE0);
gl.glBindTexture(gl.GL_TEXTURE_2D, interfaceTexture);
// Set up uniforms
gl.glUseProgram(glUiPremulProgram);
gl.glUniform1i(uniTexPremul, 0);
// Do render call
gl.glBindVertexArray(vaoUiHandle);
gl.glDrawArrays(gl.GL_TRIANGLE_FAN, 0, 4);
// Cleanup
gl.glBindFramebuffer(gl.GL_FRAMEBUFFER, 0);
gl.glEnable(gl.GL_BLEND);
// Bind the texture we just drew to for use in pass 2
gl.glBindTexture(gl.GL_TEXTURE_2D, texUiHandle);
// Change the blend function to use pre-multiplied alpha
gl.glBlendFunc(gl.GL_ONE, gl.GL_ONE_MINUS_SRC_ALPHA);
}
else
{
gl.glBindTexture(gl.GL_TEXTURE_2D, interfaceTexture);
}
// Second pass: render onto the screen
if (client.isStretchedEnabled())
{
Dimension dim = client.getStretchedDimensions();
gl.glViewport(0, 0, dim.width, dim.height);
}
else
{
gl.glViewport(0, 0, canvasWidth, canvasHeight);
}
// Use the texture bound in the first pass
gl.glUseProgram(glUiProgram);
gl.glUniform1i(uniTex, 0);
// 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.
// See https://www.khronos.org/opengl/wiki/Sampler_Object for details.
if (client.isStretchedEnabled())
{
final int function = client.isStretchedFast() ? gl.GL_NEAREST : gl.GL_LINEAR;
gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MIN_FILTER, function);
gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MAG_FILTER, function);
}
// Texture on UI
gl.glBindVertexArray(vaoUiHandle);
gl.glDrawArrays(gl.GL_TRIANGLE_FAN, 0, 4);

37
runelite-client/src/main/resources/net/runelite/client/plugins/gpu/fraguipremul.glsl Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#version 330
layout (location = 0) out vec4 color;
uniform sampler2D tex;
in vec2 TexCoord;
void main()
{
vec4 c = texture(tex, TexCoord);
color = vec4(c.rgb * c.a, c.a);
}

38
runelite-client/src/main/resources/net/runelite/client/plugins/gpu/vertuipremul.glsl Normal file
View File

@@ -0,0 +1,38 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#version 330
layout (location = 0) in vec3 aPos;
layout (location = 1) in vec2 aTexCoord;
out vec2 TexCoord;
void main()
{
gl_Position = vec4(aPos, 1.0);
// Flip the UV because it's pre-flipped in the ui texture buffer, but we don't need it to be flipped here.
TexCoord = vec2(aTexCoord.x, 1 - aTexCoord.y);
}