diff options
author | Sven Gothel <[email protected]> | 2013-08-10 08:37:13 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-08-10 08:37:13 +0200 |
commit | 3bbe227b0cec201e2bc26addfe0ab781dcb4d16f (patch) | |
tree | 616d8329be808c59c114ba9966d9e1a5ed453edb | |
parent | 5e8cba163ae898832277300b781627529d1cf1d3 (diff) |
GLContext: Refine API doc (CONTEXT_NOT_CURRENT.. values) / Exception message
-rw-r--r-- | src/jogl/classes/javax/media/opengl/GLContext.java | 6 | ||||
-rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index aa5fca2c2..f30f85213 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -111,11 +111,11 @@ public abstract class GLContext { /** Reflects property jogl.debug.TraceGL. If true, the trace pipeline is enabled at context creation. */ public static final boolean TRACE_GL = Debug.isPropertyDefined("jogl.debug.TraceGL", true); - /** Indicates that the context was not made current during the last call to {@link #makeCurrent makeCurrent}. */ + /** Indicates that the context was not made current during the last call to {@link #makeCurrent makeCurrent}, value {@value}. */ public static final int CONTEXT_NOT_CURRENT = 0; - /** Indicates that the context was made current during the last call to {@link #makeCurrent makeCurrent}. */ + /** Indicates that the context was made current during the last call to {@link #makeCurrent makeCurrent}, value {@value}. */ public static final int CONTEXT_CURRENT = 1; - /** Indicates that a newly-created context was made current during the last call to {@link #makeCurrent makeCurrent}. */ + /** Indicates that a newly-created context was made current during the last call to {@link #makeCurrent makeCurrent}, value {@value}. */ public static final int CONTEXT_CURRENT_NEW = 2; /* Version 1.00, i.e. GLSL 1.00 for ES 2.0. */ diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 996a47590..8bc57fdf2 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -320,7 +320,7 @@ public abstract class GLContextImpl extends GLContext { System.err.println(getThreadName() +": GLContext.ContextSwitch[release.0]: obj " + toHexString(hashCode()) + ", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+", inDestruction: "+inDestruction+", "+lock); } if ( !lock.isOwner(Thread.currentThread()) ) { - final String msg = getThreadName() +": Context not current on current thread, obj " + toHexString(hashCode())+", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+", inDestruction: "+inDestruction+", "+lock; + final String msg = getThreadName() +": Context not current on thread, obj " + toHexString(hashCode())+", ctx "+toHexString(contextHandle)+", surf "+toHexString(drawable.getHandle())+", inDestruction: "+inDestruction+", "+lock; if( DEBUG_TRACE_SWITCH ) { System.err.println(msg); if( null != lastCtxReleaseStack ) { @@ -443,7 +443,7 @@ public abstract class GLContextImpl extends GLContext { drawable.unlockSurface(); } if( null != associateDrawableException ) { - throw new GLException("GLContext.destroy() during associateDrawable(false)", associateDrawableException); + throw new GLException("Exception @ destroy's associateDrawable(false)", associateDrawableException); } } resetStates(); |