From a140ed4798896ed5d786fbe63e7241309a4b4a91 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 5 Apr 2011 01:44:39 +0200 Subject: Fix: DEBUG field (regression) --- src/jogl/classes/javax/media/opengl/GLContext.java | 5 ++--- src/jogl/classes/jogamp/opengl/GLContextImpl.java | 2 ++ 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(); /** -- cgit v1.2.3