Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

1 files changed, 564 insertions, 233 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index dc4f898e6..f0adb5328 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -17,286 +17,617 @@ public void setObjectTracker(GLObjectTracker tracker) {
 
 public GL4bcImpl(GLProfile glp, GLContextImpl context) {
   this._context = context; 
-  this.bufferSizeTracker  = context.getBufferSizeTracker();
-  this.bufferStateTracker = context.getBufferStateTracker();
-  this.glStateTracker     = context.getGLStateTracker();
+  if(null != context) {
+      this.bufferObjectTracker  = context.getBufferObjectTracker();
+      this.bufferStateTracker = context.getBufferStateTracker();
+      this.glStateTracker     = context.getGLStateTracker();
+  } else {
+      this.bufferObjectTracker  = null;
+      this.bufferStateTracker = null;
+      this.glStateTracker     = null;
+  }
   this.glProfile = glp;
 }
 
-/**
- * Provides platform-independent access to the wglAllocateMemoryNV /
- * glXAllocateMemoryNV extension.
- */
-public java.nio.ByteBuffer glAllocateMemoryNV(int arg0, float arg1, float arg2, float arg3) {
-  return _context.glAllocateMemoryNV(arg0, arg1, arg2, arg3);
+public final void finalizeInit() {
+  if(null != _context) {
+      haveARBPixelBufferObject  = isExtensionAvailable("GL_ARB_pixel_buffer_object");
+      haveEXTPixelBufferObject  = isExtensionAvailable("GL_EXT_pixel_buffer_object");
+      haveGL15                  = isExtensionAvailable("GL_VERSION_1_5");
+      haveGL21                  = isExtensionAvailable("GL_VERSION_2_1");
+      haveARBVertexBufferObject = isExtensionAvailable("GL_ARB_vertex_buffer_object");
+      haveARBVertexArrayObject  = _context.getGLVersionNumber().compareTo(GLContext.Version300) >= 0 ||
+                                  isExtensionAvailable("GL_ARB_vertex_array_object");
+   } else {
+      haveARBPixelBufferObject  = false;
+      haveEXTPixelBufferObject  = false;
+      haveGL15                  = false;
+      haveGL21                  = false;
+      haveARBVertexBufferObject = false;
+      haveARBVertexArrayObject  = false;
+   }
+}
+
+private int[] imageSizeTemp = new int[1];
+
+private final int imageSizeInBytes(int format, int type, int width, int height, int depth, boolean pack) {
+    return GLBuffers.sizeof(this, imageSizeTemp, format, type, width, height, depth, pack) ;                                    
+}
+
+@Override
+public final boolean isGL4bc() {
+    return _context.isGL4bc();
+}
+
+@Override
+public final boolean isGL4() {
+    return _context.isGL4();
+}
+
+@Override
+public final boolean isGL3bc() {
+    return _context.isGL3bc();
+}
+
+@Override
+public final boolean isGL3() {
+    return _context.isGL3();
+}
+
+@Override
+public final boolean isGL2() {
+    return _context.isGL2();
+}
+  
+@Override
+public final boolean isGL2ES1() {
+    return _context.isGL2ES1();
+}
+
+@Override
+public final boolean isGL2ES2() {
+    return _context.isGL2ES2();
+}
+
+@Override
+public final boolean isGL2ES3() {
+    return _context.isGL2ES3();
+}
+
+@Override
+public final boolean isGL3ES3() {
+    return _context.isGL3ES3();
+}
+
+@Override
+public final boolean isGL4ES3() {
+    return _context.isGL4ES3();
+}
+
+@Override
+public final boolean isGL4core() {
+    return _context.isGL4core();
+}
+
+@Override
+public final boolean isGL3core() {
+    return _context.isGL3core();
+}
+
+@Override
+public final boolean isGLcore() {
+    return _context.isGLcore();
+}
+
+@Override
+public final boolean isGLES2Compatible() {
+    return _context.isGLES2Compatible();
+}
+
+@Override
+public final boolean isGLES3Compatible() {
+    return _context.isGLES3Compatible();
+}
+
+@Override
+public final boolean isGL2GL3() {
+    return _context.isGL2GL3();
+}
+
+@Override
+public final boolean hasGLSL() {
+    return _context.hasGLSL();
+}
+
+@Override
+public final GL4bc getGL4bc() throws GLException {
+    if(!isGL4bc()) {
+        throw new GLException("Not a GL4bc implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL4 getGL4() throws GLException {
+    if(!isGL4()) {
+        throw new GLException("Not a GL4 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL3bc getGL3bc() throws GLException {
+    if(!isGL3bc()) {
+        throw new GLException("Not a GL3bc implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL3 getGL3() throws GLException {
+    if(!isGL3()) {
+        throw new GLException("Not a GL3 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL2 getGL2() throws GLException {
+    if(!isGL2()) {
+        throw new GLException("Not a GL2 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL2ES1 getGL2ES1() throws GLException {
+    if(!isGL2ES1()) {
+        throw new GLException("Not a GL2ES1 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL2ES2 getGL2ES2() throws GLException {
+    if(!isGL2ES2()) {
+        throw new GLException("Not a GL2ES2 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL2ES3 getGL2ES3() throws GLException {
+    if(!isGL2ES3()) {
+        throw new GLException("Not a GL2ES3 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL3ES3 getGL3ES3() throws GLException {
+    if(!isGL3ES3()) {
+        throw new GLException("Not a GL3ES3 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL4ES3 getGL4ES3() throws GLException {
+    if(!isGL4ES3()) {
+        throw new GLException("Not a GL4ES3 implementation");
+    }
+    return this;
+}
+
+@Override
+public final GL2GL3 getGL2GL3() throws GLException {
+    if(!isGL2GL3()) {
+        throw new GLException("Not a GL2GL3 implementation");
+    }
+    return this;
+}
+
+@Override
+public final boolean isGLES1() {
+    return false;
+}
+
+@Override
+public final boolean isGLES2() {
+    return false;
+}
+
+@Override
+public final boolean isGLES3() {
+    return false;
+}
+
+@Override
+public final boolean isGLES() {
+    return false;
+}
+
+@Override
+public final GLES1 getGLES1() throws GLException {
+    throw new GLException("Not a GLES1 implementation");
+}
+
+@Override
+public final GLES2 getGLES2() throws GLException {
+    throw new GLException("Not a GLES2 implementation");
+}
+
+@Override
+public final GLES3 getGLES3() throws GLException {
+    throw new GLException("Not a GLES3 implementation");
+}
+
+@Override
+public final boolean isNPOTTextureAvailable() {
+  return _context.isNPOTTextureAvailable();
+}
+@Override
+public final java.nio.ByteBuffer glAllocateMemoryNV(int size, float readFrequency, float writeFrequency, float priority) {
+  return _context.glAllocateMemoryNV(size, readFrequency, writeFrequency, priority);
+}
+
+@Override
+public final void glFreeMemoryNV(java.nio.ByteBuffer pointer) {
+  _context.glFreeMemoryNV(pointer);
 }
 
 //
 // Helpers for ensuring the correct amount of texture data
 //
 
-private GLBufferSizeTracker  bufferSizeTracker;
-private GLBufferStateTracker bufferStateTracker;
-private GLStateTracker       glStateTracker;
-
-private boolean bufferObjectExtensionsInitialized = false;
 private boolean haveARBPixelBufferObject;
 private boolean haveEXTPixelBufferObject;
 private boolean haveGL15;
 private boolean haveGL21;
 private boolean haveARBVertexBufferObject;
+private boolean haveARBVertexArrayObject;
 
-private void initBufferObjectExtensionChecks() {
-  if (bufferObjectExtensionsInitialized)
-    return;
-  bufferObjectExtensionsInitialized = true;
-  haveARBPixelBufferObject  = isExtensionAvailable("GL_ARB_pixel_buffer_object");
-  haveEXTPixelBufferObject  = isExtensionAvailable("GL_EXT_pixel_buffer_object");
-  haveGL15                  = isExtensionAvailable("GL_VERSION_1_5");
-  haveGL21                  = isExtensionAvailable("GL_VERSION_2_1");
-  haveARBVertexBufferObject = isExtensionAvailable("GL_ARB_vertex_buffer_object");
-}
-
-private boolean checkBufferObject(boolean extension1,
-                                  boolean extension2,
-                                  boolean extension3,
-                                  boolean enabled,
-                                  int state,
-                                  String kind, boolean throwException) {
-  if (inBeginEndPair) {
+private final boolean checkBufferObject(boolean extensionAvail,
+                                        boolean allowVAO,
+                                        boolean bound,
+                                        int state,
+                                        String kind, boolean throwException) {
+  if ( inBeginEndPair ) {
     throw new GLException("May not call this between glBegin and glEnd");
   }
-  boolean avail = (extension1 || extension2 || extension3);
-  if (!avail) {
-    if (!enabled)
+  if ( !extensionAvail ) {
+    if ( !bound ) {
       return true;
+    }
     if(throwException) {
         throw new GLException("Required extensions not available to call this function");
     }
     return false;
   }
   int buffer = bufferStateTracker.getBoundBufferObject(state, this);
-  if (enabled) {
-    if (buffer == 0) {
-      if(throwException) {
-          throw new GLException(kind + " must be enabled to call this method");
-      }
-      return false;
+  if ( bound ) {
+    if ( 0 != buffer ) {
+        return true;
+    }
+    if ( allowVAO ) {
+        buffer = bufferStateTracker.getBoundBufferObject(GL2ES3.GL_VERTEX_ARRAY_BINDING, this);
+        if( 0 != buffer && _context.getDefaultVAO() != buffer ) {
+            return true;
+        }
     }
+    if ( throwException ) {
+        throw new GLException(kind + " must be bound to call this method");
+    }
+    return false;
   } else {
-    if (buffer != 0) {
-      if(throwException) {
-          throw new GLException(kind + " must be disabled to call this method");
-      }
-      return false;
+    if ( 0 == buffer ) {
+        return true;
+    }
+    if ( throwException ) {
+        throw new GLException(kind + " must be unbound to call this method");
     }
+    return false;
   }
-  return true;
 }  
 
-private boolean checkArrayVBODisabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveGL15,
-                    haveARBVertexBufferObject,
-                    false,
-                    false,
-                    GL.GL_ARRAY_BUFFER,
-                    "array vertex_buffer_object", throwException);
-}
-
-private boolean checkArrayVBOEnabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveGL15,
-                    haveARBVertexBufferObject,
-                    false,
-                    true,
-                    GL.GL_ARRAY_BUFFER,
-                    "array vertex_buffer_object", throwException);
-}
-
-private boolean checkElementVBODisabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveGL15,
-                    haveARBVertexBufferObject,
-                    false,
-                    false,
-                    GL.GL_ELEMENT_ARRAY_BUFFER,
-                    "element vertex_buffer_object", throwException);
-}
-
-private boolean checkElementVBOEnabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveGL15,
-                    haveARBVertexBufferObject,
-                    false,
-                    true,
-                    GL.GL_ELEMENT_ARRAY_BUFFER,
-                    "element vertex_buffer_object", throwException);
-}
-
-private boolean checkUnpackPBODisabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveARBPixelBufferObject,
-                    haveEXTPixelBufferObject,
-                    haveGL21,
-                    false,
-                    GL2.GL_PIXEL_UNPACK_BUFFER,
-                    "unpack pixel_buffer_object", throwException);
-}
-
-private boolean checkUnpackPBOEnabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveARBPixelBufferObject,
-                    haveEXTPixelBufferObject,
-                    haveGL21,
-                    true,
-                    GL2.GL_PIXEL_UNPACK_BUFFER,
-                    "unpack pixel_buffer_object", throwException);
-}
-
-private boolean checkPackPBODisabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveARBPixelBufferObject,
-                    haveEXTPixelBufferObject,
-                    haveGL21,
-                    false,
-                    GL2.GL_PIXEL_PACK_BUFFER,
-                    "pack pixel_buffer_object", throwException);
-}
-
-private boolean checkPackPBOEnabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(haveARBPixelBufferObject,
-                    haveEXTPixelBufferObject,
-                    haveGL21,
-                    true,
-                    GL2.GL_PIXEL_PACK_BUFFER,
-                    "pack pixel_buffer_object", throwException);
-}
-
-public boolean glIsPBOPackEnabled() {
-    return checkPackPBOEnabled(false);
-}
-
-public boolean glIsPBOUnpackEnabled() {
-    return checkUnpackPBOEnabled(false);
-}
-
-private HashMap<MemoryObject, MemoryObject> arbMemCache = new HashMap<MemoryObject, MemoryObject>();
-
-/** Entry point to C language function: <br> <code> LPVOID glMapBuffer(GLenum target, GLenum access); </code>    */
-public java.nio.ByteBuffer glMapBuffer(int target, int access) {
-  final long __addr_ = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapBuffer\" not available");
-  }
-  final long sz = bufferSizeTracker.getBufferSize(bufferStateTracker, target, this);
-  if (0 == sz) {
-    return null;
+private final void validateCPUSourcedAvail() {
+    if(!_context.isCPUDataSourcingAvail()) {
+        throw new GLException("CPU data sourcing n/a w/ "+_context);
+    }
+}
+
+private final boolean checkArrayVBOUnbound(boolean throwException) { 
+  if(throwException) {
+      validateCPUSourcedAvail();
   }
-  final long addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (0 == addr) {
-    return null;
+  return checkBufferObject(haveGL15 || haveARBVertexBufferObject,
+                           haveARBVertexArrayObject, // allowVAO
+                           false, // bound
+                           GL.GL_ARRAY_BUFFER,
+                           "array vertex_buffer_object", throwException);
+}
+
+private final boolean checkArrayVBOBound(boolean throwException) { 
+  return checkBufferObject(haveGL15 || haveARBVertexBufferObject,
+                           haveARBVertexArrayObject, // allowVAO
+                           true, // bound
+                           GL.GL_ARRAY_BUFFER,
+                           "array vertex_buffer_object", throwException);
+}
+
+private final boolean checkElementVBOUnbound(boolean throwException) { 
+  if(throwException) {
+      validateCPUSourcedAvail();
   }
-  ByteBuffer buffer;
-  MemoryObject memObj0 = new MemoryObject(addr, sz); // object and key
-  MemoryObject memObj1 = MemoryObject.getOrAddSafe(arbMemCache, memObj0);
-  if(memObj0 == memObj1) {
-    // just added ..
-    if(null != memObj0.getBuffer()) {
-        throw new InternalError();
-    }
-    buffer = newDirectByteBuffer(addr, sz);
-    Buffers.nativeOrder(buffer);
-    memObj0.setBuffer(buffer);
-  } else {
-    // already mapped
-    buffer = memObj1.getBuffer();
-    if(null == buffer) {
-        throw new InternalError();
-    }
+  return checkBufferObject(haveGL15 || haveARBVertexBufferObject,
+                           haveARBVertexArrayObject, // allowVAO
+                           false, // bound
+                           GL.GL_ELEMENT_ARRAY_BUFFER,
+                           "element vertex_buffer_object", throwException);
+}
+
+private final boolean checkElementVBOBound(boolean throwException) { 
+  return checkBufferObject(haveGL15 || haveARBVertexBufferObject,
+                           haveARBVertexArrayObject, // allowVAO
+                           true, // bound
+                           GL.GL_ELEMENT_ARRAY_BUFFER,
+                           "element vertex_buffer_object", throwException);
+}
+
+private final boolean checkIndirectVBOUnbound(boolean throwException) { 
+  if(throwException) {
+      validateCPUSourcedAvail();
   }
-  buffer.position(0);
-  return buffer;
+  return checkBufferObject(haveGL15 || haveARBVertexBufferObject,
+                           haveARBVertexArrayObject, // allowVAO
+                           false, // bound
+                           GL4.GL_DRAW_INDIRECT_BUFFER,
+                           "indirect vertex_buffer_object", throwException);
 }
 
-/** Encapsulates function pointer for OpenGL function <br>: <code> LPVOID glMapBuffer(GLenum target, GLenum access); </code>    */
-native private long dispatch_glMapBuffer(int target, int access, long glProcAddress);
+private final boolean checkIndirectVBOBound(boolean throwException) { 
+  return checkBufferObject(haveGL15 || haveARBVertexBufferObject,
+                           haveARBVertexArrayObject, // allowVAO
+                           true, // bound
+                           GL4.GL_DRAW_INDIRECT_BUFFER,
+                           "indirect vertex_buffer_object", throwException);
+}
 
-/** Entry point to C language function: <code> GLvoid *  {@native glMapNamedBufferEXT}(GLuint buffer, GLenum access); </code> <br>Part of <code>GL_EXT_direct_state_access</code>   */
-public java.nio.ByteBuffer glMapNamedBufferEXT(int bufferName, int access)  {
-  final long __addr_ = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapNamedBufferEXT;
-  if (__addr_ == 0) {
-    throw new GLException("Method \"glMapNamedBufferEXT\" not available");
+private final boolean checkUnpackPBOUnbound(boolean throwException) { 
+  return checkBufferObject(haveGL21 || haveARBPixelBufferObject || haveEXTPixelBufferObject,
+                           false, // allowVAO
+                           false, // bound
+                           GL2.GL_PIXEL_UNPACK_BUFFER,
+                           "unpack pixel_buffer_object", throwException);
+}
+
+private final boolean checkUnpackPBOBound(boolean throwException) { 
+  return checkBufferObject(haveGL21 || haveARBPixelBufferObject || haveEXTPixelBufferObject,
+                           false, // allowVAO
+                           true, // bound
+                           GL2.GL_PIXEL_UNPACK_BUFFER,
+                           "unpack pixel_buffer_object", throwException);
+}
+
+private final boolean checkPackPBOUnbound(boolean throwException) { 
+  return checkBufferObject(haveGL21 || haveARBPixelBufferObject || haveEXTPixelBufferObject,
+                           false, // allowVAO
+                           false, // bound
+                           GL2.GL_PIXEL_PACK_BUFFER,
+                           "pack pixel_buffer_object", throwException);
+}
+
+private final boolean checkPackPBOBound(boolean throwException) { 
+  return checkBufferObject(haveGL21 || haveARBPixelBufferObject || haveEXTPixelBufferObject,
+                           false, // allowVAO
+                           true, // bound
+                           GL2.GL_PIXEL_PACK_BUFFER,
+                           "pack pixel_buffer_object", throwException);
+}
+
+@Override
+public final boolean glIsPBOPackBound() {
+    return isPBOPackBound();
+}
+@Override
+public final boolean isPBOPackBound() {
+    return checkPackPBOBound(false);
+}
+
+@Override
+public final boolean glIsPBOUnpackBound() {
+    return isPBOUnpackBound();
+}
+@Override
+public final boolean isPBOUnpackBound() {
+    return checkUnpackPBOBound(false);
+}
+
+@Override
+public final void glVertexPointer(GLArrayData array) {
+  if(array.getComponentCount()==0) return;
+  if(array.isVBO()) {
+      glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+  } else {
+      glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
   }
-  final long sz = bufferSizeTracker.getDirectStateBufferSize(bufferName, this);
-  if (0 == sz) {
-    return null;
+}
+@Override
+public final void glColorPointer(GLArrayData array) {
+  if(array.getComponentCount()==0) return;
+  if(array.isVBO()) {
+      glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+  } else {
+      glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
   }
-  final long addr = dispatch_glMapNamedBufferEXT(bufferName, access, __addr_);
-  if (0 == addr) {
-    return null;
+
+}
+@Override
+public final void glNormalPointer(GLArrayData array) {
+  if(array.getComponentCount()==0) return;
+  if(array.getComponentCount()!=3) {
+    throw new GLException("Only 3 components per normal allowed");
   }
-  ByteBuffer buffer;
-  MemoryObject memObj0 = new MemoryObject(addr, sz); // object and key
-  MemoryObject memObj1 = MemoryObject.getOrAddSafe(arbMemCache, memObj0);
-  if(memObj0 == memObj1) {
-    // just added ..
-    if(null != memObj0.getBuffer()) {
-        throw new InternalError();
-    }
-    buffer = newDirectByteBuffer(addr, sz);
-    Buffers.nativeOrder(buffer);
-    memObj0.setBuffer(buffer);
+  if(array.isVBO()) {
+      glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
   } else {
-    // already mapped
-    buffer = memObj1.getBuffer();
-    if(null == buffer) {
-        throw new InternalError();
-    }
+      glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
+  }
+}
+@Override
+public final void glTexCoordPointer(GLArrayData array) {
+  if(array.getComponentCount()==0) return;
+  if(array.isVBO()) {
+      glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+  } else {
+      glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
   }
-  buffer.position(0);
-  return buffer;
 }
 
-private native long dispatch_glMapNamedBufferEXT(int buffer, int access, long procAddress);
-
-native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
+//
+// GLBufferObjectTracker Redirects
+//
 
-    public void glVertexPointer(GLArrayData array) {
-      if(array.getComponentCount()==0) return;
-      if(array.isVBO()) {
-          glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
-      } else {
-          glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
+@Override
+public final void glBufferData(int target, long size, Buffer data, int usage)  {
+    final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glBufferData;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glBufferData"));
     }
-    public void glColorPointer(GLArrayData array) {
-      if(array.getComponentCount()==0) return;
-      if(array.isVBO()) {
-          glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
-      } else {
-          glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
+    bufferObjectTracker.createBufferStorage(bufferStateTracker, this, 
+                                            target, size, data, usage, 0 /* immutableFlags */, 
+                                            createBoundMutableStorageDispatch, glProcAddress);
+}
+/** FIXME Add for OpenGL 4.4
+@Override
+public final void glBufferStorage(int target, long size, Buffer data, int flags)  {
+    final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glBufferStorage;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glBufferStorage"));
+    }
+    bufferObjectTracker.createBufferStorage(bufferStateTracker, this, 
+                                            target, size, data, 0 * mutableUsage *, flags, 
+                                            createBoundImmutableStorageDispatch, glProcAddress);
+}
+private final jogamp.opengl.GLBufferObjectTracker.CreateStorageDispatch createBoundImmutableStorageDispatch = 
+    new jogamp.opengl.GLBufferObjectTracker.CreateStorageDispatch() {
+        public final void create(final int target, final long size, final Buffer data, final int immutableFlags, final long glProcAddress) {
+            final boolean data_is_direct = Buffers.isDirect(data);
+            dispatch_glBufferStorage(target, size, 
+                                  data_is_direct ? data : Buffers.getArray(data), 
+                                  data_is_direct ? Buffers.getDirectBufferByteOffset(data) : Buffers.getIndirectBufferByteOffset(data), 
+                                  data_is_direct, immutableFlags, glProcAddress);
+        }
+    };
+private native void dispatch_glBufferStorage(int target, long size, Object data, int data_byte_offset, boolean data_is_direct, int flags, long procAddress);
+ */
 
+@Override
+public final void glNamedBufferDataEXT(int buffer, long size, Buffer data, int usage)  {
+    final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glNamedBufferDataEXT;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glNamedBufferDataEXT"));
     }
-    public void glNormalPointer(GLArrayData array) {
-      if(array.getComponentCount()==0) return;
-      if(array.getComponentCount()!=3) {
-        throw new GLException("Only 3 components per normal allowed");
-      }
-      if(array.isVBO()) {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getVBOOffset());
-      } else {
-          glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
-      }
+    bufferObjectTracker.createBufferStorage(this, 
+                                            buffer, size, data, usage, 0 /* immutableFlags */,
+                                            createNamedStorageDispatch, glProcAddress);
+}
+private final jogamp.opengl.GLBufferObjectTracker.CreateStorageDispatch createNamedStorageDispatch = 
+    new jogamp.opengl.GLBufferObjectTracker.CreateStorageDispatch() {
+        public final void create(final int buffer, final long size, final Buffer data, final int mutableUsage, final long glProcAddress) {
+            final boolean data_is_direct = Buffers.isDirect(data);
+            dispatch_glNamedBufferDataEXT(buffer, size,
+                                          data_is_direct ? data : Buffers.getArray(data), 
+                                          data_is_direct ? Buffers.getDirectBufferByteOffset(data) : Buffers.getIndirectBufferByteOffset(data), 
+                                          data_is_direct, mutableUsage, glProcAddress);
+        }
+    };
+private native void dispatch_glNamedBufferDataEXT(int buffer, long size, Object data, int data_byte_offset, boolean data_is_direct, int usage, long procAddress);
+
+@Override
+public boolean glUnmapBuffer(int target)  {
+    final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glUnmapBuffer;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glUnmapBuffer"));
     }
-    public void glTexCoordPointer(GLArrayData array) {
-      if(array.getComponentCount()==0) return;
-      if(array.isVBO()) {
-          glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
-      } else {
-          glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
-      }
+    return bufferObjectTracker.unmapBuffer(bufferStateTracker, this, target, unmapBoundBufferDispatch, glProcAddress);
+}
+
+@Override
+public boolean glUnmapNamedBufferEXT(int buffer)  {
+    final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glUnmapNamedBufferEXT;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glUnmapNamedBufferEXT"));
     }
+    return bufferObjectTracker.unmapBuffer(buffer, unmapNamedBufferDispatch, glProcAddress);
+}
+private final jogamp.opengl.GLBufferObjectTracker.UnmapBufferDispatch unmapNamedBufferDispatch = 
+    new jogamp.opengl.GLBufferObjectTracker.UnmapBufferDispatch() {
+        public final boolean unmap(final int buffer, final long glProcAddress) {
+            return dispatch_glUnmapNamedBufferEXT(buffer, glProcAddress);
+        }
+    };
+private native boolean dispatch_glUnmapNamedBufferEXT(int buffer, long procAddress);
+
+@Override
+public final GLBufferStorage mapBuffer(final int target, final int access) {
+  final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBuffer;
+  if ( 0 == glProcAddress ) {
+    throw new GLException("Method \"glMapBuffer\" not available");
+  }
+  return bufferObjectTracker.mapBuffer(bufferStateTracker, this, target, access, mapBoundBufferAllDispatch, glProcAddress);
+}
+@Override
+public final GLBufferStorage mapBufferRange(final int target, final long offset, final long length, final int access) {
+  final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapBufferRange;
+  if ( 0 == glProcAddress ) {
+    throw new GLException("Method \"glMapBufferRange\" not available");
+  }
+  return bufferObjectTracker.mapBuffer(bufferStateTracker, this, target, offset, length, access, mapBoundBufferRangeDispatch, glProcAddress);
+}
+
+@Override
+public final GLBufferStorage mapNamedBuffer(final int bufferName, final int access) {
+  final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapNamedBufferEXT;
+  if ( 0 == glProcAddress ) {
+    throw new GLException("Method \"glMapNamedBufferEXT\" not available");
+  }
+  return bufferObjectTracker.mapBuffer(bufferName, access, mapNamedBufferAllDispatch, glProcAddress);
+}
+private final jogamp.opengl.GLBufferObjectTracker.MapBufferAllDispatch mapNamedBufferAllDispatch = 
+    new jogamp.opengl.GLBufferObjectTracker.MapBufferAllDispatch() {
+        public final ByteBuffer allocNioByteBuffer(final long addr, final long length) { return newDirectByteBuffer(addr, length); }
+        public final long mapBuffer(final int bufferName, final int access, final long glProcAddress) {
+            return dispatch_glMapNamedBufferEXT(bufferName, access, glProcAddress);
+        }
+    };
+private native long dispatch_glMapNamedBufferEXT(int buffer, int access, long glProcAddress);
+
+@Override
+public final GLBufferStorage mapNamedBufferRange(final int bufferName, final long offset, final long length, final int access) {
+  final long glProcAddress = ((GL4bcProcAddressTable)_context.getGLProcAddressTable())._addressof_glMapNamedBufferRangeEXT;
+  if ( 0 == glProcAddress ) {
+    throw new GLException("Method \"glMapNamedBufferRangeEXT\" not available");
+  }
+  return bufferObjectTracker.mapBuffer(bufferName, offset, length, access, mapNamedBufferRangeDispatch, glProcAddress);
+}
+private final jogamp.opengl.GLBufferObjectTracker.MapBufferRangeDispatch mapNamedBufferRangeDispatch = 
+    new jogamp.opengl.GLBufferObjectTracker.MapBufferRangeDispatch() {
+        public final ByteBuffer allocNioByteBuffer(final long addr, final long length) { return newDirectByteBuffer(addr, length); }
+        public final long mapBuffer(final int bufferName, final long offset, final long length, final int access, final long glProcAddress) {
+            return dispatch_glMapNamedBufferRangeEXT(bufferName, offset, length, access, glProcAddress);
+        }
+    };
+private native long dispatch_glMapNamedBufferRangeEXT(int buffer, long offset, long length, int access, long procAddress);
+
+@Override
+public final java.nio.ByteBuffer glMapNamedBufferEXT(int bufferName, int access)  {
+  return mapNamedBuffer(bufferName, access).getMappedBuffer();
+}
+
+@Override
+public final ByteBuffer glMapNamedBufferRangeEXT(int bufferName, long offset, long length, int access)  {
+  return mapNamedBufferRange(bufferName, offset, length, access).getMappedBuffer();
+}
+