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, 174 insertions, 110 deletions

diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 9b0d98fe9..6a7e12ca1 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -1,103 +1,196 @@
 public GLES1Impl(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;
 }
 
+public final void finalizeInit() {
+}
+
+@Override
 public final boolean isGL4bc() {
     return false;
 }
 
+@Override
 public final boolean isGL4() {
     return false;
 }
 
+@Override
 public final boolean isGL3bc() {
     return false;
 }
 
+@Override
 public final boolean isGL3() {
     return false;
 }
 
+@Override
 public final boolean isGL2() {
     return false;
 }
 
+@Override
 public final boolean isGLES1() {
     return true;
 }
 
+@Override
 public final boolean isGLES2() {
     return false;
 }
 
+@Override
+public final boolean isGLES3() {
+    return false;
+}
+
+@Override
 public final boolean isGLES() {
     return true;
 }
 
+@Override
 public final boolean isGL2ES1() {
     return true;
 }
 
+@Override
 public final boolean isGL2ES2() {
     return false;
 }
 
+@Override
+public final boolean isGL2ES3() {
+    return false;
+}
+
+@Override
+public final boolean isGL3ES3() {
+    return false;
+}
+
+@Override
+public final boolean isGL4ES3() {
+    return false;
+}
+
+@Override
+public final boolean isGL4core() {
+    return false;
+}
+
+@Override
+public final boolean isGL3core() {
+    return false;
+}
+
+@Override
+public final boolean isGLcore() {
+    return false;
+}
+
+@Override
 public final boolean isGLES2Compatible() {
     return false;
 }
 
+@Override
+public final boolean isGLES3Compatible() {
+    return false;
+}
+
+@Override
 public final boolean isGL2GL3() {
     return false;
 }
 
+@Override
 public final boolean hasGLSL() {
     return false;
 }
 
+@Override
 public boolean isNPOTTextureAvailable() {
   return false;
 }
 
+@Override
 public final GL4bc getGL4bc() throws GLException {
     throw new GLException("Not a GL4bc implementation");
 }
 
+@Override
 public final GL4 getGL4() throws GLException {
     throw new GLException("Not a GL4 implementation");
 }
 
+@Override
 public final GL3bc getGL3bc() throws GLException {
     throw new GLException("Not a GL3bc implementation");
 }
 
+@Override
 public final GL3 getGL3() throws GLException {
     throw new GLException("Not a GL3 implementation");
 }
 
+@Override
 public final GL2 getGL2() throws GLException {
     throw new GLException("Not a GL2 implementation");
 }
 
+@Override
 public final GLES1 getGLES1() throws GLException {
     return this;
 }
 
+@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 GL2ES1 getGL2ES1() throws GLException {
     return this;
 }
 
+@Override
+public final GL2ES3 getGL2ES3() throws GLException {
+    throw new GLException("Not a GL2ES3 implementation");
+}
+
+@Override
 public final GL2ES2 getGL2ES2() throws GLException {
     throw new GLException("Not a GL2ES2 implementation");
 }
 
+@Override
+public final GL3ES3 getGL3ES3() throws GLException {
+    throw new GLException("Not a GL3ES3 implementation");
+}
+
+@Override
+public final GL4ES3 getGL4ES3() throws GLException {
+    throw new GLException("Not a GL4ES3 implementation");
+}
+
+@Override
 public final GL2GL3 getGL2GL3() throws GLException {
     throw new GLException("Not a GL2GL3 implementation");
 }
@@ -106,44 +199,21 @@ public final GL2GL3 getGL2GL3() throws GLException {
 // Helpers for ensuring the correct amount of texture data
 //
 
-private GLBufferSizeTracker  bufferSizeTracker;
-private GLBufferStateTracker bufferStateTracker;
-private GLStateTracker       glStateTracker;
-
-private boolean bufferObjectExtensionsInitialized = false;
-private boolean haveOESFramebufferObject;
-
-private void initBufferObjectExtensionChecks() {
-  if (bufferObjectExtensionsInitialized)
-    return;
-  bufferObjectExtensionsInitialized = true;
-  haveOESFramebufferObject  = isExtensionAvailable("GL_OES_framebuffer_object");
-}
-
-private boolean checkBufferObject(boolean avail,
-                                  boolean enabled,
-                                  int state,
-                                  String kind, boolean throwException) {
-  if (!avail) {
-    if (!enabled)
-      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) {
+private final boolean checkBufferObject(boolean bound,
+                                        int state,
+                                        String kind, boolean throwException) {
+  final int buffer = bufferStateTracker.getBoundBufferObject(state, this);
+  if (bound) {
+    if (0 == buffer) {
       if(throwException) {
-          throw new GLException(kind + " must be enabled to call this method");
+          throw new GLException(kind + " must be bound to call this method");
       }
       return false;
     }
   } else {
-    if (buffer != 0) {
+    if (0 != buffer) {
       if(throwException) {
-          throw new GLException(kind + " must be disabled to call this method");
+          throw new GLException(kind + " must be unbound to call this method");
       }
       return false;
     }
@@ -151,102 +221,52 @@ private boolean checkBufferObject(boolean avail,
   return true;
 }  
 
-private boolean checkArrayVBODisabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(true,
-                    false,
-                    GL.GL_ARRAY_BUFFER,
-                    "array vertex_buffer_object", throwException);
+private final boolean checkArrayVBOUnbound(boolean throwException) { 
+  return checkBufferObject(false, // bound
+                           GL.GL_ARRAY_BUFFER,
+                           "array vertex_buffer_object", throwException);
 }
 
-private boolean checkArrayVBOEnabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(true,
-                    true,
-                    GL.GL_ARRAY_BUFFER,
-                    "array vertex_buffer_object", throwException);
+private final boolean checkArrayVBOBound(boolean throwException) { 
+  return checkBufferObject(true, // bound
+                           GL.GL_ARRAY_BUFFER,
+                           "array vertex_buffer_object", throwException);
 }
 
-private boolean checkElementVBODisabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(true,
-                    false,
-                    GL.GL_ELEMENT_ARRAY_BUFFER,
-                    "element vertex_buffer_object", throwException);
+private final boolean checkElementVBOUnbound(boolean throwException) { 
+  return checkBufferObject(false, // bound
+                           GL.GL_ELEMENT_ARRAY_BUFFER,
+                           "element vertex_buffer_object", throwException);
 }
 
-private boolean checkElementVBOEnabled(boolean throwException) { 
-  initBufferObjectExtensionChecks();
-  return checkBufferObject(true,
-                    true,
-                    GL.GL_ELEMENT_ARRAY_BUFFER,
-                    "element vertex_buffer_object", throwException);
+private final boolean checkElementVBOBound(boolean throwException) { 
+  return checkBufferObject(true, // bound
+                           GL.GL_ELEMENT_ARRAY_BUFFER,
+                           "element vertex_buffer_object", throwException);
 }
 
-private boolean checkUnpackPBODisabled(boolean throwException) { 
+private final boolean checkUnpackPBOUnbound(boolean throwException) { 
     // PBO n/a for ES 1.1 or ES 2.0
     return true;
 }
 
-private boolean checkUnpackPBOEnabled(boolean throwException) { 
+private final boolean checkUnpackPBOBound(boolean throwException) { 
     // PBO n/a for ES 1.1 or ES 2.0
     return false;
 }
 
-private boolean checkPackPBODisabled(boolean throwException) { 
+private final boolean checkPackPBOUnbound(boolean throwException) { 
     // PBO n/a for ES 1.1 or ES 2.0
     return true;
 }
 
-private boolean checkPackPBOEnabled(boolean throwException) { 
+private final boolean checkPackPBOBound(boolean throwException) { 
     // PBO n/a for ES 1.1 or ES 2.0
     return 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_ = ((GLES1ProcAddressTable)_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;
-  }
-  final long addr = dispatch_glMapBuffer(target, access, __addr_);
-  if (0 == addr) {
-    return null;
-  }
-  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();
-    }
-  }
-  buffer.position(0);
-  return buffer;
-}
-
-/** 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);
-
-native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
-
-public void glVertexPointer(GLArrayData array) {
+@Override
+public final void glVertexPointer(GLArrayData array) {
   if(array.getComponentCount()==0) return;
   if(array.isVBO()) {
       glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
@@ -254,7 +274,8 @@ public void glVertexPointer(GLArrayData array) {
       glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
   }
 }
-public void glColorPointer(GLArrayData array) {
+@Override
+public final void glColorPointer(GLArrayData array) {
   if(array.getComponentCount()==0) return;
   if(array.isVBO()) {
       glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
@@ -263,7 +284,8 @@ public void glColorPointer(GLArrayData array) {
   }
 
 }
-public void glNormalPointer(GLArrayData array) {
+@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");
@@ -274,7 +296,8 @@ public void glNormalPointer(GLArrayData array) {
       glNormalPointer(array.getComponentType(), array.getStride(), array.getBuffer());
   }
 }
-public void glTexCoordPointer(GLArrayData array) {
+@Override
+public final void glTexCoordPointer(GLArrayData array) {
   if(array.getComponentCount()==0) return;
   if(array.isVBO()) {
       glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
@@ -283,3 +306,44 @@ public void glTexCoordPointer(GLArrayData array) {
   }
 }
 
+//
+// GLBufferObjectTracker Redirects
+//
+
+@Override
+public final void glBufferData(int target, long size, Buffer data, int usage)  {
+    final long glProcAddress = ((GLES1ProcAddressTable)_context.getGLProcAddressTable())._addressof_glBufferData;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glBufferData"));
+    }
+    bufferObjectTracker.createBufferStorage(bufferStateTracker, this, 
+                                            target, size, data, usage, 0 /* immutableFlags */,
+                                            createBoundMutableStorageDispatch, glProcAddress);
+}
+
+@Override
+public boolean glUnmapBuffer(int target)  {
+    final long glProcAddress = ((GLES1ProcAddressTable)_context.getGLProcAddressTable())._addressof_glUnmapBuffer;
+    if ( 0 == glProcAddress ) {
+      throw new GLException(String.format("Method \"%s\" not available", "glUnmapBuffer"));
+    }
+    return bufferObjectTracker.unmapBuffer(bufferStateTracker, this, target, unmapBoundBufferDispatch, glProcAddress);
+}
+
+@Override
+public final GLBufferStorage mapBuffer(final int target, final int access) {
+  final long glProcAddress = ((GLES1ProcAddressTable)_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 = ((GLES1ProcAddressTable)_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);
+}
+