diff options
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/GLDrawableHelper.java | 1 | ||||
| -rw-r--r-- | src/newt/classes/com/jogamp/newt/opengl/GLWindow.java | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java index d079a1bd1..8911b9ab3 100644 --- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java +++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java @@ -337,6 +337,7 @@ public class GLDrawableHelper { // Support for recursive makeCurrent() calls as well as calling // other drawables' display() methods from within another one's + // FIXME: re-evaluate due to possible expensive TLS access ? GLContext lastContext = GLContext.getCurrent(); Runnable lastInitAction = (Runnable) perThreadInitAction.get(); if (lastContext != null) { diff --git a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java index efbd9594b..48531fcf8 100644 --- a/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/jogamp/newt/opengl/GLWindow.java @@ -569,13 +569,7 @@ public class GLWindow implements GLAutoDrawable, Window, NEWTEventConsumer { public void swapBuffers() { if(drawable!=null && context != null) { - // Lock: Locked Surface/Window by MakeCurrent/Release - if (context != GLContext.getCurrent()) { - // Assume we should try to make the context current before swapping the buffers - helper.invokeGL(drawable, context, swapBuffersAction, initAction); - } else { - drawable.swapBuffers(); - } + drawable.swapBuffers(); } } |