From b98bb2d14d5d5ff96fd5c22f4f30bc685d86757b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 13 Oct 2012 08:24:02 +0200 Subject: FBO ResetQuirk: Dump only brief information (OS, GL, JOGL sha1), the latter becomes public method to JoglVersion --- src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java') 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 -- cgit v1.2.3