Bug 942 - Share GLBufferStateTracker ; Unify GLBufferStateTracker and GLBufferSizeTracker (simplification)

Due to future mapped buffer tracking, the GLBufferStateTracker instance shall be shared
across shared GLContextImpl instances similar to GLSizeStateTracker!

This allows us to merge GLSizeStateTracker code into GLBufferStateTracker
to simplify the implementation.

+++

Clear the GLBufferStateTracker (@destruction) only if no more
created shares are left!

+++

6 files changed, 5 insertions, 14 deletions

diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index b84115445..ee4af5e69 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -557,7 +557,7 @@ JavaEpilogue glPushClientAttrib bufferStateTracker.clearBufferObjectState();
 JavaEpilogue glPushClientAttrib glStateTracker.pushAttrib(mask);
 JavaEpilogue glPopClientAttrib  bufferStateTracker.clearBufferObjectState();
 JavaEpilogue glPopClientAttrib  glStateTracker.popAttrib();
-JavaEpilogue glBufferData       bufferSizeTracker.setBufferSize(bufferStateTracker, {0}, this, {1});
+JavaEpilogue glBufferData       bufferStateTracker.setBufferSize({0}, this, {1});
 
 BufferObjectKind Array glColorPointer
 BufferObjectKind Array glEdgeFlagPointer
diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg
index c3a392c52..e6e85e2e5 100644
--- a/make/config/jogl/gl-gl4bc.cfg
+++ b/make/config/jogl/gl-gl4bc.cfg
@@ -59,7 +59,7 @@ Include gl2_es2-CustomJavaCode.cfg
 # can only be computed by calling another routine
 ManuallyImplement glMapNamedBufferEXT
 ForceProcAddressGen glMapNamedBufferEXT
-JavaEpilogue glNamedBufferDataEXT bufferSizeTracker.setDirectStateBufferSize({0}, this, {1});
+JavaEpilogue glNamedBufferDataEXT bufferStateTracker.setDirectStateBufferSize({0}, this, {1});
 
 # Manuall implement glDebugMessageCallback* using the proc address resolver
 ForceProcAddressGen glDebugMessageCallback
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java
index b8da61065..3aeda1309 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-common.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java
@@ -11,7 +11,7 @@
 
     @Override
     public final long glGetBufferSize(int buffer) {
-        return bufferSizeTracker.getDirectStateBufferSize(buffer, this);
+        return bufferStateTracker.getDirectStateBufferSize(buffer, this);
     }
 
     @Override
@@ -135,7 +135,7 @@
       if (glProcAddress == 0) {
         throw new GLException("Method \""+(useRange?"glMapBufferRange":"glMapBuffer")+"\" not available");
       }
-      final long sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, this);
+      final long sz = bufferStateTracker.getBufferSize(target, this);
       if (0 == sz) {
         return null;
       }
@@ -188,7 +188,7 @@
       if (glProcAddress == 0) {
         throw new GLException("Method \"glMapNamedBufferEXT\" not available");
       }
-      final long sz = bufferSizeTracker.getDirectStateBufferSize(bufferName, this);
+      final long sz = bufferStateTracker.getDirectStateBufferSize(bufferName, this);
       if (0 == sz) {
         return null;
       }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index e7389de10..980603edc 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -18,11 +18,9 @@ public void setObjectTracker(GLObjectTracker tracker) {
 public GL4bcImpl(GLProfile glp, GLContextImpl context) {
   this._context = context; 
   if(null != context) {
-      this.bufferSizeTracker  = context.getBufferSizeTracker();
       this.bufferStateTracker = context.getBufferStateTracker();
       this.glStateTracker     = context.getGLStateTracker();
   } else {
-      this.bufferSizeTracker  = null;
       this.bufferStateTracker = null;
       this.glStateTracker     = null;
   }
@@ -280,7 +278,6 @@ public final void glFreeMemoryNV(java.nio.ByteBuffer pointer) {
 // Helpers for ensuring the correct amount of texture data
 //
 
-private final GLBufferSizeTracker  bufferSizeTracker;
 private final GLBufferStateTracker bufferStateTracker;
 private final GLStateTracker       glStateTracker;
 
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 8d5dcc7a5..1d1cf3abf 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -1,11 +1,9 @@
 public GLES1Impl(GLProfile glp, GLContextImpl context) {
   this._context = context; 
   if(null != context) {
-      this.bufferSizeTracker  = context.getBufferSizeTracker();
       this.bufferStateTracker = context.getBufferStateTracker();
       this.glStateTracker     = context.getGLStateTracker();
   } else {
-      this.bufferSizeTracker  = null;
       this.bufferStateTracker = null;
       this.glStateTracker     = null;
   }
@@ -199,7 +197,6 @@ public final GL2GL3 getGL2GL3() throws GLException {
 // Helpers for ensuring the correct amount of texture data
 //
 
-private final GLBufferSizeTracker  bufferSizeTracker;
 private final GLBufferStateTracker bufferStateTracker;
 private final GLStateTracker       glStateTracker;
 
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
index d5ad16873..006ee4da1 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles3.java
@@ -2,11 +2,9 @@
 public GLES3Impl(GLProfile glp, GLContextImpl context) {
   this._context = context; 
   if(null != context) {
-      this.bufferSizeTracker  = context.getBufferSizeTracker();
       this.bufferStateTracker = context.getBufferStateTracker();
       this.glStateTracker     = context.getGLStateTracker();
   } else {
-      this.bufferSizeTracker  = null;
       this.bufferStateTracker = null;
       this.glStateTracker     = null;
   }
@@ -211,7 +209,6 @@ public final GL2GL3 getGL2GL3() throws GLException {
 //
 
 private final boolean _isES3;
-private final GLBufferSizeTracker  bufferSizeTracker;
 private final GLBufferStateTracker bufferStateTracker;
 private final GLStateTracker       glStateTracker;