Refine 9c7ab101cf5261db3ef6160c0aa1906ffcce188b: Don't print extensions .. too much

6 files changed, 21 insertions, 13 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index e551b85f6..1f0189aa3 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -130,7 +130,7 @@ public class JoglVersion extends JogampVersion {
     public static StringBuilder getGLInfo(GL gl, StringBuilder sb) {
         return getGLInfo(gl, sb, false);
     }
-    public static StringBuilder getGLInfo(GL gl, StringBuilder sb, boolean withCapabilitiesInfo) {
+    public static StringBuilder getGLInfo(GL gl, StringBuilder sb, boolean withCapabilitiesAndExtensionInfo) {
         AbstractGraphicsDevice device = gl.getContext().getGLDrawable().getNativeSurface()
                                             .getGraphicsConfiguration().getScreen().getDevice();
         if(null==sb) {
@@ -143,15 +143,19 @@ public class JoglVersion extends JogampVersion {
         GLProfile.glAvailabilityToString(device, sb, "\t", 1);        
         sb.append(Platform.getNewline());
 
-        sb = getGLStrings(gl, sb);
+        sb = getGLStrings(gl, sb, withCapabilitiesAndExtensionInfo);
         
-        if( withCapabilitiesInfo ) {
+        if( withCapabilitiesAndExtensionInfo ) {
             sb = getAllAvailableCapabilitiesInfo(device, sb);            
         }
         return sb;
     }
     
-    public static StringBuilder getGLStrings(GL gl, StringBuilder sb) {        
+    public static StringBuilder getGLStrings(GL gl, StringBuilder sb) {
+        return getGLStrings(gl, sb, true);
+    }
+    
+    public static StringBuilder getGLStrings(GL gl, StringBuilder sb, boolean withExtensions) {        
         if(null==sb) {
             sb = new StringBuilder();
         }
@@ -181,12 +185,16 @@ public class JoglVersion extends JogampVersion {
         sb.append(Platform.getNewline());
         sb.append("GL_EXTENSIONS  ").append(ctx.getGLExtensionCount());
         sb.append(Platform.getNewline());
-        sb.append("               ").append(ctx.getGLExtensionsString());
-        sb.append(Platform.getNewline());
+        if( withExtensions ) {
+            sb.append("               ").append(ctx.getGLExtensionsString());
+            sb.append(Platform.getNewline());
+        }
         sb.append("GLX_EXTENSIONS ").append(ctx.getPlatformExtensionCount());
         sb.append(Platform.getNewline());
-        sb.append("               ").append(ctx.getPlatformExtensionsString());
-        sb.append(Platform.getNewline());
+        if( withExtensions ) {
+            sb.append("               ").append(ctx.getPlatformExtensionsString());
+            sb.append(Platform.getNewline());
+        }
         sb.append(VersionUtil.SEPERATOR);
 
         return sb;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java
index 9af71b8bd..63e89952f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java
@@ -147,7 +147,7 @@ public class GearsES1 implements GLEventListener {
     System.err.println("GearsES1 init on "+Thread.currentThread());
     System.err.println("Chosen GLCapabilities: " + drawable.getChosenGLCapabilities());
     System.err.println("INIT GL IS: " + gl.getClass().getName());
-    System.err.println(JoglVersion.getGLStrings(gl, null).toString());
+    System.err.println(JoglVersion.getGLStrings(gl, null, false).toString());
 
     gl.glLightfv(GL2ES1.GL_LIGHT0, GL2ES1.GL_POSITION, pos, 0);
     gl.glEnable(GL.GL_CULL_FACE);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/RedSquareES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/RedSquareES1.java
index dcad92bab..3b5ba1c83 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/RedSquareES1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/RedSquareES1.java
@@ -81,7 +81,7 @@ public class RedSquareES1 implements GLEventListener {
         System.err.println("RedSquareES1 init on "+Thread.currentThread());
         System.err.println("Chosen GLCapabilities: " + drawable.getChosenGLCapabilities());
         System.err.println("INIT GL IS: " + gl.getClass().getName());
-        System.err.println(JoglVersion.getGLStrings(gl, null).toString());
+        System.err.println(JoglVersion.getGLStrings(gl, null, false).toString());
 
         // Allocate vertex arrays
         colors   = Buffers.newDirectFloatBuffer(16);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
index a68ca71fd..75a25e2ad 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
@@ -131,7 +131,7 @@ public class GearsES2 implements GLEventListener {
             System.err.println("GearsES2 init on "+Thread.currentThread());
             System.err.println("Chosen GLCapabilities: " + drawable.getChosenGLCapabilities());
             System.err.println("INIT GL IS: " + gl.getClass().getName());
-            System.err.println(JoglVersion.getGLStrings(gl, null).toString());
+            System.err.println(JoglVersion.getGLStrings(gl, null, false).toString());
         }        
         if( !gl.hasGLSL() ) {
             System.err.println("No GLSL available, no rendering.");
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
index 248a5eed2..1ba4d126f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
@@ -70,7 +70,7 @@ public class RedSquareES2 implements GLEventListener {
         System.err.println("RedSquareES2 init on "+Thread.currentThread());
         System.err.println("Chosen GLCapabilities: " + glad.getChosenGLCapabilities());
         System.err.println("INIT GL IS: " + gl.getClass().getName());
-        System.err.println(JoglVersion.getGLStrings(gl, null).toString());
+        System.err.println(JoglVersion.getGLStrings(gl, null, false).toString());
         if( !gl.hasGLSL() ) {
             System.err.println("No GLSL available, no rendering.");
             return;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java
index ff50dc3e4..020c5c63f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/Gears.java
@@ -71,7 +71,7 @@ public class Gears implements GLEventListener {
     System.err.println("GearsGL2 init on "+Thread.currentThread());
     System.err.println("Chosen GLCapabilities: " + drawable.getChosenGLCapabilities());
     System.err.println("INIT GL IS: " + gl.getClass().getName());
-    System.err.println(JoglVersion.getGLStrings(gl, null).toString());
+    System.err.println(JoglVersion.getGLStrings(gl, null, false).toString());
     
     float pos[] = { 5.0f, 5.0f, 10.0f, 0.0f };
     float red[] = { 0.8f, 0.1f, 0.0f, 0.7f };