diff --git a/java/libraries/opengl/src/processing/opengl/PGL.java b/java/libraries/opengl/src/processing/opengl/PGL.java index 81e917d70..71fdb95cc 100644 --- a/java/libraries/opengl/src/processing/opengl/PGL.java +++ b/java/libraries/opengl/src/processing/opengl/PGL.java @@ -232,10 +232,11 @@ public class PGL { public static final int GL_TRIANGLE_STRIP = GL.GL_TRIANGLE_STRIP; public static final int GL_TRIANGLES = GL.GL_TRIANGLES; - public static final int GL_VENDOR = GL.GL_VENDOR; - public static final int GL_RENDERER = GL.GL_RENDERER; - public static final int GL_VERSION = GL.GL_VERSION; - public static final int GL_EXTENSIONS = GL.GL_EXTENSIONS; + public static final int GL_VENDOR = GL.GL_VENDOR; + public static final int GL_RENDERER = GL.GL_RENDERER; + public static final int GL_VERSION = GL.GL_VERSION; + public static final int GL_EXTENSIONS = GL.GL_EXTENSIONS; + public static final int GL_SHADING_LANGUAGE_VERSION = GL2ES2.GL_SHADING_LANGUAGE_VERSION; public static final int GL_MAX_TEXTURE_SIZE = GL.GL_MAX_TEXTURE_SIZE; public static final int GL_MAX_SAMPLES = GL2.GL_MAX_SAMPLES; diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java index c53eb4fb7..805f559d3 100644 --- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java +++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java @@ -134,6 +134,7 @@ public class PGraphicsOpenGL extends PGraphics { static public String OPENGL_RENDERER; static public String OPENGL_VERSION; static public String OPENGL_EXTENSIONS; + static public String GLSL_VERSION; // ........................................................ @@ -1456,15 +1457,12 @@ public class PGraphicsOpenGL extends PGraphics { } if (quality < 2) { pgl.glDisable(PGL.GL_MULTISAMPLE); -// pgl.glEnable(PGL.GL_POINT_SMOOTH); -// pgl.glEnable(PGL.GL_LINE_SMOOTH); -// pgl.glEnable(PGL.GL_POLYGON_SMOOTH); } else { pgl.glEnable(PGL.GL_MULTISAMPLE); - pgl.glDisable(PGL.GL_POINT_SMOOTH); - pgl.glDisable(PGL.GL_LINE_SMOOTH); - pgl.glDisable(PGL.GL_POLYGON_SMOOTH); } + pgl.glDisable(PGL.GL_POINT_SMOOTH); + pgl.glDisable(PGL.GL_LINE_SMOOTH); + pgl.glDisable(PGL.GL_POLYGON_SMOOTH); // setup opengl viewport. viewport[0] = 0; viewport[1] = 0; viewport[2] = width; viewport[3] = height; @@ -5653,7 +5651,9 @@ public class PGraphicsOpenGL extends PGraphics { OPENGL_VENDOR = pgl.glGetString(PGL.GL_VENDOR); OPENGL_RENDERER = pgl.glGetString(PGL.GL_RENDERER); OPENGL_VERSION = pgl.glGetString(PGL.GL_VERSION); + OPENGL_VERSION = pgl.glGetString(PGL.GL_VERSION); OPENGL_EXTENSIONS = pgl.glGetString(PGL.GL_EXTENSIONS); + GLSL_VERSION = pgl.glGetString(PGL.GL_SHADING_LANGUAGE_VERSION); npotTexSupported = -1 < OPENGL_EXTENSIONS.indexOf("texture_non_power_of_two"); mipmapGeneration = -1 < OPENGL_EXTENSIONS.indexOf("generate_mipmap");