FBO ResetQuirk: Dump only brief information (OS, GL, JOGL sha1), the latter becomes public method to JoglVersion

2 files changed, 28 insertions, 5 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
index cdb4b82bb..52721e3f4 100644
--- a/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
+++ b/src/jogl/classes/com/jogamp/opengl/JoglVersion.java
@@ -169,6 +169,23 @@ public class JoglVersion extends JogampVersion {
         return sb;
     }
 
+    public StringBuilder getBriefOSGLBuildInfo(GL gl, StringBuilder sb) {        
+        if(null==sb) {
+            sb = new StringBuilder();
+        }
+        sb.append("OS: ").append(Platform.getOSName()).append(", version ").append(Platform.getOSVersion()).append(", arch ").append(Platform.getArchName());
+        sb.append(Platform.getNewline());
+        sb.append("GL_VENDOR     ").append(gl.glGetString(GL.GL_VENDOR));
+        sb.append(Platform.getNewline());
+        sb.append("GL_RENDERER   ").append(gl.glGetString(GL.GL_RENDERER));
+        sb.append(Platform.getNewline());
+        sb.append("GL_VERSION    ").append(gl.glGetString(GL.GL_VERSION));
+        sb.append(Platform.getNewline());
+        sb.append("JOGL GIT sha1 ").append(getImplementationCommit());
+        sb.append(Platform.getNewline());
+        return sb;
+    }
+    
     public static void main(String args[]) {
         System.err.println(VersionUtil.getPlatformInfo());
         System.err.println(GlueGenVersion.getInstance());
diff --git a/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java
index a516060fb..b5b723f7c 100644
--- a/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java
@@ -11,6 +11,7 @@ import javax.media.opengl.GLContext;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLFBODrawable;
 
+import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.VersionUtil;
 import com.jogamp.nativewindow.MutableGraphicsConfiguration;
 import com.jogamp.opengl.FBObject;
@@ -171,11 +172,16 @@ public class GLFBODrawableImpl extends GLDrawableImpl implements GLFBODrawable {
                 }
                 if(!resetQuirkInfoDumped) { // dump info only once
                     resetQuirkInfoDumped = true;
-                    System.err.println("GLFBODrawable: Reset failed: "+e.getMessage());
-                    System.err.println("GLFBODrawable: Enabling FBOResetQuirk, due to previous GLException. "+this.toString());
-                    System.err.println(VersionUtil.getPlatformInfo());
-                    System.err.println(JoglVersion.getInstance());
-                    System.err.println(JoglVersion.getGLInfo(gl, null));
+                    System.err.println("GLFBODrawable: FBO Reset failed: "+e.getMessage());
+                    System.err.println("GLFBODrawable: Enabling FBOResetQuirk, due to GL driver bug.");
+                    final JoglVersion joglVersion = JoglVersion.getInstance();
+                    if(DEBUG) {
+                        System.err.println(VersionUtil.getPlatformInfo());
+                        System.err.println(joglVersion.toString());
+                        System.err.println(JoglVersion.getGLInfo(gl, null));
+                    } else {
+                        System.err.println(joglVersion.getBriefOSGLBuildInfo(gl, null));                        
+                    }
                 }
                 fboResetQuirk = true;
                 // 'fallthrough' intended