summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-04-05 01:44:39 +0200
committerSven Gothel <[email protected]>2011-04-05 01:44:39 +0200
commita140ed4798896ed5d786fbe63e7241309a4b4a91 (patch)
tree206afb4fcd6f8cfb6f737359ab8fd17134d9bbac
parent8297ef88b927e07b41760ab3e9de05bc49fd4695 (diff)
Fix: DEBUG field (regression)
-rw-r--r--src/jogl/classes/javax/media/opengl/GLContext.java5
-rw-r--r--src/jogl/classes/jogamp/opengl/GLContextImpl.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index c5f0bc83e..f5d47d27c 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -44,6 +44,7 @@ import java.util.HashMap;
import java.util.HashSet;
import javax.media.nativewindow.AbstractGraphicsDevice;
import jogamp.opengl.Debug;
+import jogamp.opengl.GLContextImpl;
/** Abstraction for an OpenGL rendering context. In order to perform
OpenGL rendering, a context must be "made current" on the current
@@ -63,8 +64,6 @@ public abstract class GLContext {
/** Reflects property jogl.debug.TraceGL. If true, the trace pipeline is enabled at context creation. */
public final static boolean TRACE_GL = Debug.debug("TraceGL");
- protected static final boolean DEBUG = Debug.debug("GLContext");
-
/** Indicates that the context was not made current during the last call to {@link #makeCurrent makeCurrent}. */
public static final int CONTEXT_NOT_CURRENT = 0;
/** Indicates that the context was made current during the last call to {@link #makeCurrent makeCurrent}. */
@@ -606,7 +605,7 @@ public abstract class GLContext {
throw new InternalError("Already set: "+devKey);
}
deviceVersionsAvailableSet.add(devKey);
- if (DEBUG) {
+ if (GLContextImpl.DEBUG) {
String msg = getThreadName() + ": !!! createContextARB: SET mappedVersionsAvailableSet "+devKey;
// Throwable t = new Throwable(msg);
// t.printStackTrace();
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 373f41699..9361fb0f9 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -63,6 +63,8 @@ import javax.media.opengl.GLPipelineFactory;
import javax.media.opengl.GLProfile;
public abstract class GLContextImpl extends GLContext {
+ public static final boolean DEBUG = Debug.debug("GLContext");
+
protected GLContextLock lock = new GLContextLock();
/**