From 44d09b860117b7cc349fb99725893daa82919bd3 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Sat, 17 Nov 2018 14:03:22 +0100 Subject: [PATCH] Switch to core profile in GPU plugin This makes GPU plugin available to more people and workarounds bug in JOGL on Linux where it is not detecting compatible profile on some systems. Signed-off-by: Tomas Slusny --- .../main/java/net/runelite/client/plugins/gpu/GpuPlugin.java | 4 ++-- .../main/resources/net/runelite/client/plugins/gpu/frag.glsl | 2 +- .../main/resources/net/runelite/client/plugins/gpu/geom.glsl | 2 +- .../main/resources/net/runelite/client/plugins/gpu/vert.glsl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 94153a5b59..a1d66b4544 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -227,7 +227,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks GLProfile.initSingleton(); - GLProfile glProfile = GLProfile.get(GLProfile.GL4bc); + GLProfile glProfile = GLProfile.get(GLProfile.GL4); GLCapabilities glCaps = new GLCapabilities(glProfile); AbstractGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), @@ -872,7 +872,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks // Texture on UI gl.glBindVertexArray(vaoUiHandle); - gl.glDrawArrays(gl.GL_QUADS, 0, 4); + gl.glDrawArrays(gl.GL_TRIANGLE_FAN, 0, 4); // Reset gl.glBindTexture(gl.GL_TEXTURE_2D, 0); diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl index 2a83da4281..1ba7123d91 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/frag.glsl @@ -22,7 +22,7 @@ * (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 400 +#version 330 uniform sampler2DArray textures; uniform vec2 textureOffsets[64]; diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/geom.glsl b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/geom.glsl index 0fe57ecdb7..c5fd56da66 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/geom.glsl +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/geom.glsl @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#version 400 +#version 330 #define PI 3.1415926535897932384626433832795f #define UNIT PI / 1024.0f diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/vert.glsl b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/vert.glsl index 557255570b..e8652d2714 100644 --- a/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/vert.glsl +++ b/runelite-client/src/main/resources/net/runelite/client/plugins/gpu/vert.glsl @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#version 400 +#version 330 layout (location = 0) in ivec4 VertexPosition; layout (location = 1) in vec4 uv;