From aa7cbaea0c6998644ca9311f269ba0aae224d1c4 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 27 Oct 2013 18:52:00 +0100 Subject: Fix GLCanvas ctor shared GLContext: Use helper.setSharedContext(..) remove local shared ctx fields. Regression of 7f7a23dd0ddf106e6f0c69fc2a05ff92ac56200e --- src/jogl/classes/javax/media/opengl/awt/GLCanvas.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/jogl/classes/javax') diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index b070ddd7d..c2d8e0535 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -173,9 +173,6 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing private final GraphicsDevice device; private boolean shallUseOffscreenLayer = false; - protected GLContext sharedContext = null; - protected GLAutoDrawable sharedAutoDrawable = null; - private final AWTWindowClosingProtocol awtWindowClosingProtocol = new AWTWindowClosingProtocol(this, new Runnable() { @Override @@ -293,7 +290,9 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing // instantiation will be issued in addNotify() this.capsReqUser = capsReqUser; this.chooser = chooser; - this.sharedContext = shareWith; + if( null != shareWith ) { + helper.setSharedContext(null, shareWith); + } this.device = device; } -- cgit v1.2.3