From 6fb58e36bbb071cdd77284fafe26dce3440e9448 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 23 Nov 2018 14:47:19 +0000 Subject: [PATCH] Do not use static imports for GL constants This ensures that we do not accidentally use constant from wrong GL version than we are using atm. Signed-off-by: Tomas Slusny --- .../java/net/runelite/client/plugins/gpu/GpuPlugin.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 e5dd9e717f..c157b4280e 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 @@ -29,8 +29,6 @@ import com.google.inject.Provides; import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration; import com.jogamp.nativewindow.awt.JAWTWindow; import com.jogamp.opengl.GL; -import static com.jogamp.opengl.GL2ES2.GL_DEBUG_OUTPUT; -import static com.jogamp.opengl.GL3ES3.GL_SHADER_STORAGE_BARRIER_BIT; import com.jogamp.opengl.GL4; import com.jogamp.opengl.GLCapabilities; import com.jogamp.opengl.GLContext; @@ -276,7 +274,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks if (log.isDebugEnabled()) { - gl.glEnable(GL_DEBUG_OUTPUT); + gl.glEnable(gl.GL_DEBUG_OUTPUT); // Suppress warning messages which flood the log on NVIDIA systems. gl.getContext().glDebugMessageControl(gl.GL_DEBUG_SOURCE_API, gl.GL_DEBUG_TYPE_OTHER, @@ -873,7 +871,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glDispatchCompute(largeModels, 1, 1); - gl.glMemoryBarrier(GL_SHADER_STORAGE_BARRIER_BIT); + gl.glMemoryBarrier(gl.GL_SHADER_STORAGE_BARRIER_BIT); if (textureArrayId == -1) {