From 474ada7c9fa2c9e47232abfde66353af58ea35f2 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 23 Jan 2015 20:36:13 +0100 Subject: Misc Fix: GLContext*; Refine DEBUG output in GLDrawableFactory's createShareResource - Fix GLContext.makeCurrent() API doc for 'throws GLException' - Fix GLContext.makeCurrentResultToString(int): CONTEXT_CURRENT_NEW -> "CONTEXT_CURRENT_NEW" - Fix GLContextImpl.setGLDrawable(..) - Catch Throwable instead of GLException to not loose other cases - Fix GLContextImpl.makeCurrent(..) - Use const l-value in branch expression - fix semantic typo: validate -> validated - Refine DEBUG output in GLDrawableFactory's createShareResource - Enable DEBUG via GLContext.DEBUG as well to ease analysis w/o drawable DEBUG output --- src/jogl/classes/javax/media/opengl/GLContext.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/jogl/classes/javax') diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index a71961122..f6c5a3245 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -443,10 +443,8 @@ public abstract class GLContext { *
  • {@link #CONTEXT_NOT_CURRENT} if the context could not be made current.
    • * * - * @throws GLException if synchronization is disabled and the - * context is current on another thread, or because the context - * could not be created or made current due to non-recoverable, - * window system-specific errors. + * @throws GLException if the context could not be created + * or made current due to non-recoverable, system-specific errors. */ public abstract int makeCurrent() throws GLException; @@ -542,7 +540,7 @@ public abstract class GLContext { switch(res) { case CONTEXT_NOT_CURRENT: return "CONTEXT_NOT_CURRENT"; case CONTEXT_CURRENT: return "CONTEXT_CURRENT"; - case CONTEXT_CURRENT_NEW: return "CONTEXT_NOT_CURRENT"; + case CONTEXT_CURRENT_NEW: return "CONTEXT_CURRENT_NEW"; default: return "INVALID_VALUE"; } } -- cgit v1.2.3