aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-10-27 18:52:00 +0100
committerSven Gothel <[email protected]>2013-10-27 18:52:00 +0100
commitaa7cbaea0c6998644ca9311f269ba0aae224d1c4 (patch)
tree89b0d5b0009f9cfd47bb32264737e2e3583bacd2 /src/jogl
parent7f7a23dd0ddf106e6f0c69fc2a05ff92ac56200e (diff)
Fix GLCanvas ctor shared GLContext: Use helper.setSharedContext(..) remove local shared ctx fields.
Regression of 7f7a23dd0ddf106e6f0c69fc2a05ff92ac56200e
Diffstat (limited to 'src/jogl')
-rw-r--r--src/jogl/classes/javax/media/opengl/awt/GLCanvas.java7
1 files changed, 3 insertions, 4 deletions
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;
}