1 files changed, 20 insertions, 8 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 8bbc82b5a..8f1ba4585 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -102,7 +102,8 @@ public abstract class GLContextImpl extends GLContext {
 
   // Tracks creation and initialization of buffer objects to avoid
   // repeated glGet calls upon glMapBuffer operations
-  private final GLBufferStateTracker bufferStateTracker;
+  private GLBufferSizeTracker bufferSizeTracker; // Singleton - Set by GLContextShareSet
+  private final GLBufferStateTracker bufferStateTracker = new GLBufferStateTracker();
   private final GLStateTracker glStateTracker = new GLStateTracker();
   private GLDebugMessageHandler glDebugHandler = null;
   private final int[] boundFBOTarget = new int[] { 0, 0 }; // { draw, read }
@@ -137,13 +138,10 @@ public abstract class GLContextImpl extends GLContext {
   public GLContextImpl(GLDrawableImpl drawable, GLContext shareWith) {
     super();
 
-    if ( null != shareWith ) {
+    if (shareWith != null) {
       GLContextShareSet.registerSharing(this, shareWith);
-      bufferStateTracker = ((GLContextImpl)shareWith).getBufferStateTracker();
-      assert (bufferStateTracker != null) : "shared context hash null bufferStateTracker: "+shareWith;
-    } else {
-      bufferStateTracker = new GLBufferStateTracker();
     }
+    GLContextShareSet.synchronizeBufferObjectSharing(shareWith, this);
 
     this.drawable = drawable;
     this.drawableRead = drawable;
@@ -152,9 +150,15 @@ public abstract class GLContextImpl extends GLContext {
   }
 
   private final void clearStates() {
-      if( !GLContextShareSet.hasCreatedSharedLeft(this) ) {
-          bufferStateTracker.clear();
+      // Because we don't know how many other contexts we might be
+      // sharing with (and it seems too complicated to implement the
+      // GLObjectTracker's ref/unref scheme for the buffer-related
+      // optimizations), simply clear the cache of known buffers' sizes
+      // when we destroy contexts
+      if (bufferSizeTracker != null) {
+          bufferSizeTracker.clearCachedBufferSizes();
       }
+      bufferStateTracker.clearBufferObjectState();
       glStateTracker.setEnabled(false);
       glStateTracker.clearStates();
   }
@@ -2119,6 +2123,14 @@ public abstract class GLContextImpl extends GLContext {
   //----------------------------------------------------------------------
   // Helpers for buffer object optimizations
 
+  public final void setBufferSizeTracker(GLBufferSizeTracker bufferSizeTracker) {
+    this.bufferSizeTracker = bufferSizeTracker;
+  }
+
+  public final GLBufferSizeTracker getBufferSizeTracker() {
+    return bufferSizeTracker;
+  }
+
   public final GLBufferStateTracker getBufferStateTracker() {
     return bufferStateTracker;
   }