diff options
| author | Sven Gothel <[email protected]> | 2012-04-03 18:25:13 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-04-03 18:25:13 +0200 |
| commit | 3c5a509ef1e6be2ae7542901e6fbe5a0035fb3f7 (patch) | |
| tree | 8dd15ed7bfe7de2cbeb22196ee9e8763708280b7 | |
| parent | 834c8290de028cdfd16d3da11d1f6a4566ffb8c1 (diff) | |
GLContext: Don't enable TRACE_SWITCH if DEBUG is enabled.
| -rw-r--r-- | src/jogl/classes/javax/media/opengl/GLContext.java | 2 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index 51adce70c..5ea7d8c3a 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -67,7 +67,7 @@ import jogamp.opengl.GLContextImpl; refer to a given context. */ public abstract class GLContext { public static final boolean DEBUG = Debug.debug("GLContext"); - public static final boolean TRACE_SWITCH = DEBUG || Debug.isPropertyDefined("jogl.debug.GLContext.TraceSwitch", true); + public static final boolean TRACE_SWITCH = Debug.isPropertyDefined("jogl.debug.GLContext.TraceSwitch", true); /** Reflects property jogl.debug.DebugGL. If true, the debug pipeline is enabled at context creation. */ public final static boolean DEBUG_GL = Debug.isPropertyDefined("jogl.debug.DebugGL", true); diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index f21b61b48..f34856414 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -281,7 +281,7 @@ public abstract class GLContextImpl extends GLContext { if(lock.getHoldCount() > 2) { throw new GLException("XXX: "+lock); } - if (TRACE_SWITCH) { + if (DEBUG || TRACE_SWITCH) { System.err.println(getThreadName() + ": GLContextImpl.destroy.0: " + toHexString(contextHandle) + ", isShared "+GLContextShareSet.isShared(this)+" - "+lock); } @@ -470,7 +470,7 @@ public abstract class GLContextImpl extends GLContext { if(TRACE_GL) { gl = gl.getContext().setGL( GLPipelineFactory.create("javax.media.opengl.Trace", null, gl, new Object[] { System.err } ) ); } - if(TRACE_SWITCH) { + if(DEBUG || TRACE_SWITCH) { System.err.println(getThreadName() +": GLContext.ContextSwitch: - switch - CONTEXT_CURRENT_NEW - "+lock); } } else if(TRACE_SWITCH) { |