summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/jogamp
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2012-04-05 02:47:56 +0200
committerSven Gothel <sgothel@jausoft.com>2012-04-05 02:47:56 +0200
commita4c8271adc1932903a34e34bee24ff274ed1a81e (patch)
treee2bf6ca1eaffea1416458f306ed35667ad3c327b /src/jogl/classes/com/jogamp
parent9f8e09e57813628215c41887d3bdf6fd11472cc1 (diff)
JoglVersion: Dump GLSL version if GLSL is available.
Diffstat (limited to 'src/jogl/classes/com/jogamp')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/JoglVersion.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index 7bf299383..c8e5d212b 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -139,6 +139,11 @@ public class JoglVersion extends JogampVersion {
sb.append(Platform.getNewline());
sb.append("GL_VERSION ").append(gl.glGetString(GL.GL_VERSION));
sb.append(Platform.getNewline());
+ sb.append("GLSL ").append(gl.hasGLSL()).append(", has-compiler: ").append(gl.isFunctionAvailable("glCompileShader"));
+ if(gl.hasGLSL()) {
+ sb.append(", version: ").append(gl.glGetString(GL2ES2.GL_SHADING_LANGUAGE_VERSION));
+ }
+ sb.append(Platform.getNewline());
sb.append("GL_EXTENSIONS ").append(ctx.getGLExtensionCount());
sb.append(Platform.getNewline());
sb.append(" ").append(ctx.getGLExtensionsString());
@@ -147,8 +152,6 @@ public class JoglVersion extends JogampVersion {
sb.append(Platform.getNewline());
sb.append(" ").append(ctx.getPlatformExtensionsString());
sb.append(Platform.getNewline());
- sb.append("GLSL ").append(gl.hasGLSL()).append(", shader-compiler: ").append(gl.isFunctionAvailable("glCompileShader"));
- sb.append(Platform.getNewline());
sb.append(VersionUtil.SEPERATOR);
return sb;