Moved remaining portions of fixed function emulation out of core JOGL

public and implementation packages and into
com.sun.opengl.util.glsl.fixed.* and other subpackages of
com.sun.opengl.util. Renamed javax.media.opengl.sub.GLObject to
javax.media.opengl.GLBase. Moved interfaces in
javax.media.opengl.sub.fixed to javax.media.opengl.fixedfunc and
changed naming convention. Moved all classes in
javax.media.opengl.util to com.sun.opengl.util. Moved
com.sun.opengl.impl.packrect to com.sun.opengl.util.packrect. Renamed
InternalBufferUtils to InternalBufferUtil to match naming convention
and copied in needed routines for GLU and other classes. Fixed build
breakage when specifying rootrel.build property; reintroduced
build-temp directory. Updated demos.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1886 232f8b59-042b-4e1e-8c03-345bb8c30851

23 files changed, 140 insertions, 101 deletions

diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg
index e0280c056..bdd9a3655 100755
--- a/make/config/jogl/eglext.cfg
+++ b/make/config/jogl/eglext.cfg
@@ -10,7 +10,7 @@ ImplPackage com.sun.opengl.impl.egl
 ImplJavaClass EGLExtImpl
 # Shouldn't matter which one of these we pick up
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java
 HierarchicalNativeOutput false
 Include gl-common.cfg
 
diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg
index 608aafad3..1ee882e40 100644
--- a/make/config/jogl/gl-common.cfg
+++ b/make/config/jogl/gl-common.cfg
@@ -9,8 +9,7 @@ UnsupportedExceptionType GLException
 Import java.nio.*
 Import java.util.*
 Import javax.media.opengl.*
-Import javax.media.opengl.sub.*
-Import javax.media.opengl.sub.fixed.*
+Import javax.media.opengl.fixedfunc.*
 Import com.sun.opengl.impl.*
 
 #####################################################################
diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg
index a90c47874..a840aedb5 100755
--- a/make/config/jogl/gl-es1.cfg
+++ b/make/config/jogl/gl-es1.cfg
@@ -2,32 +2,32 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/es1
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 # There are a few routines we don't handle yet
 Ignore glGetBufferPointervOES
 Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GLES1
-Extends GLES1 GLObject
+Extends GLES1 GLBase
 Extends GLES1 GL
 Extends GLES1 GL2ES1
-Extends GLES1 GLMatrixIf
-Extends GLES1 GLPointerIf
-Extends GLES1 GLLightingIf
+Extends GLES1 GLMatrixFunc
+Extends GLES1 GLPointerFunc
+Extends GLES1 GLLightingFunc
 ImplPackage com.sun.opengl.impl.es1
 ImplJavaClass GLES1Impl
-Implements GLES1Impl GLObject
+Implements GLES1Impl GLBase
 Implements GLES1Impl GL
 Implements GLES1Impl GL2ES1
-Implements GLES1Impl GLMatrixIf
-Implements GLES1Impl GLPointerIf
-Implements GLES1Impl GLLightingIf
+Implements GLES1Impl GLMatrixFunc
+Implements GLES1Impl GLPointerFunc
+Implements GLES1Impl GLLightingFunc
 HierarchicalNativeOutput false
 Include gl-common.cfg
 Include gl-common-extensions.cfg
@@ -83,5 +83,4 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
-Import javax.media.opengl.util.BufferUtil
-
+Import com.sun.opengl.impl.InternalBufferUtil
diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg
index b9f2f2de4..af0867a6f 100755
--- a/make/config/jogl/gl-es2.cfg
+++ b/make/config/jogl/gl-es2.cfg
@@ -2,19 +2,19 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/es2
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
 
 Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GLES2
-Extends GLES2 GLObject
+Extends GLES2 GLBase
 Extends GLES2 GL
 Extends GLES2 GL2ES2
 ImplPackage com.sun.opengl.impl.es2
 ImplJavaClass GLES2Impl
-Implements GLES2Impl GLObject
+Implements GLES2Impl GLBase
 Implements GLES2Impl GL
 Implements GLES2Impl GL2ES2
 HierarchicalNativeOutput false
@@ -64,6 +64,6 @@ Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GLArrayData
 Import javax.media.opengl.GLUniformData
-Import javax.media.opengl.util.BufferUtil
+Import com.sun.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
 
diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg
index 5d3df7574..f0aafd932 100644
--- a/make/config/jogl/gl-gl2.cfg
+++ b/make/config/jogl/gl-gl2.cfg
@@ -2,33 +2,33 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl2
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 Package javax.media.opengl
 Style InterfaceAndImpl
 JavaClass GL2
-Extends GL2 GLObject
+Extends GL2 GLBase
 Extends GL2 GL
 Extends GL2 GL2ES1
 Extends GL2 GL2ES2
-Extends GL2 GLMatrixIf
-Extends GL2 GLPointerIf
-Extends GL2 GLLightingIf
+Extends GL2 GLMatrixFunc
+Extends GL2 GLPointerFunc
+Extends GL2 GLLightingFunc
 ImplPackage com.sun.opengl.impl.gl2
 ImplJavaClass GL2Impl
-Implements GL2Impl GLObject
+Implements GL2Impl GLBase
 Implements GL2Impl GL
 Implements GL2Impl GL2ES1
 Implements GL2Impl GL2ES2
-Implements GL2Impl GLMatrixIf
-Implements GL2Impl GLPointerIf
-Implements GL2Impl GLLightingIf
+Implements GL2Impl GLMatrixFunc
+Implements GL2Impl GLPointerFunc
+Implements GL2Impl GLLightingFunc
 Include gl-common-gl2.cfg
 Include gl-common-extensions.cfg
 Include gl-desktop.cfg
@@ -76,5 +76,5 @@ Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2
 Import javax.media.opengl.GLArrayData
 Import javax.media.opengl.GLUniformData
-Import javax.media.opengl.util.BufferUtil
+Import com.sun.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg
index 98c2fd3f1..6d1b34bcf 100644
--- a/make/config/jogl/gl-gl2es12.cfg
+++ b/make/config/jogl/gl-gl2es12.cfg
@@ -2,13 +2,13 @@
 JavaOutputDir gensrc/classes
 NativeOutputDir gensrc/native/jogl/gl2es12
 
-ExtendedInterfaceSymbolsOnly ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbolsOnly ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES1.java
-ExtendedInterfaceSymbolsOnly ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL2ES2.java
-ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
-ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
-ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java
-ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java
+ExtendedInterfaceSymbolsOnly ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 Package javax.media.opengl
 Style InterfaceAndImpl
@@ -16,19 +16,19 @@ JavaClass GL2ES12
 Extends GL2ES12 GL
 Extends GL2ES12 GL2ES1
 Extends GL2ES12 GL2ES2
-Extends GL2ES12 GLObject
-Extends GL2ES12 GLMatrixIf
-Extends GL2ES12 GLPointerIf
-Extends GL2ES12 GLLightingIf
+Extends GL2ES12 GLBase
+Extends GL2ES12 GLMatrixFunc
+Extends GL2ES12 GLPointerFunc
+Extends GL2ES12 GLLightingFunc
 ImplPackage com.sun.opengl.impl.gl2es12
 ImplJavaClass GL2ES12Impl
 Implements GL2ES12Impl GL
 Implements GL2ES12Impl GL2ES1
 Implements GL2ES12Impl GL2ES2
-Implements GL2ES12Impl GLObject
-Implements GL2ES12Impl GLMatrixIf
-Implements GL2ES12Impl GLPointerIf
-Implements GL2ES12Impl GLLightingIf
+Implements GL2ES12Impl GLBase
+Implements GL2ES12Impl GLMatrixFunc
+Implements GL2ES12Impl GLPointerFunc
+Implements GL2ES12Impl GLLightingFunc
 
 Include gl-common-gl2.cfg
 Include gl-common-extensions.cfg
@@ -68,5 +68,5 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c
 Import javax.media.opengl.GLES1
 Import javax.media.opengl.GLES2
 Import javax.media.opengl.GL2ES12
-Import javax.media.opengl.util.BufferUtil
+Import com.sun.opengl.impl.InternalBufferUtil
 Import java.io.PrintStream
diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg
index 110a6ee43..d24b7f8fa 100755
--- a/make/config/jogl/gl-if-gl.cfg
+++ b/make/config/jogl/gl-if-gl.cfg
@@ -2,9 +2,9 @@
 Package javax.media.opengl
 Style InterfaceOnly
 JavaClass GL
-Extends GL GLObject
+Extends GL GLBase
 
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg
index 654659343..ecd9bc525 100755
--- a/make/config/jogl/gl-if-gl2_es1.cfg
+++ b/make/config/jogl/gl-if-gl2_es1.cfg
@@ -2,17 +2,17 @@
 Package javax.media.opengl
 Style InterfaceOnly
 JavaClass GL2ES1
-Extends GL2ES1 GLObject
+Extends GL2ES1 GLBase
 Extends GL2ES1 GL
-Extends GL2ES1 GLMatrixIf
-Extends GL2ES1 GLPointerIf
-Extends GL2ES1 GLLightingIf
+Extends GL2ES1 GLMatrixFunc
+Extends GL2ES1 GLPointerFunc
+Extends GL2ES1 GLLightingFunc
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLMatrixIf.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLPointerIf.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/fixed/GLLightingIf.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg
index 493dc2242..716351c3f 100755
--- a/make/config/jogl/gl-if-gl2_es2.cfg
+++ b/make/config/jogl/gl-if-gl2_es2.cfg
@@ -2,11 +2,11 @@
 Package javax.media.opengl
 Style InterfaceOnly
 JavaClass GL2ES2
-Extends GL2ES2 GLObject
+Extends GL2ES2 GLBase
 Extends GL2ES2 GL
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/javax/media/opengl/GL.java
-ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/sub/GLObject.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/javax/media/opengl/GL.java
+ExtendedInterfaceSymbols ../src/jogl/classes/javax/media/opengl/GLBase.java
 HierarchicalNativeOutput false
 Include gl-common.cfg
 Include gl-common-extensions.cfg
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c
index d6a051b36..f97b8eaff 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2.c
@@ -13,3 +13,12 @@ Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject
   return (jlong) (intptr_t) _res;
 }
 
+/*   Java->C glue code:
+ *   Java package: com.sun.opengl.impl.gl2.GL2Impl
+ *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
+ *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
+ */
+JNIEXPORT jobject JNICALL
+Java_com_sun_opengl_impl_gl2_GL2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+  return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
+}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
index e056672d3..e2d5cb58d 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c
@@ -13,3 +13,12 @@ Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env,
   return (jlong) (intptr_t) _res;
 }
 
+/*   Java->C glue code:
+ *   Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl
+ *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
+ *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
+ */
+JNIEXPORT jobject JNICALL
+Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+  return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
+}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c
index ca5e0374c..efc614e64 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles1.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c
@@ -14,3 +14,12 @@ Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
   return (jlong) (intptr_t) _res;
 }
 
+/*   Java->C glue code:
+ *   Java package: com.sun.opengl.impl.es1.GLES1Impl
+ *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
+ *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
+ */
+JNIEXPORT jobject JNICALL
+Java_com_sun_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+  return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
+}
diff --git a/make/config/jogl/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c
index a138d88cc..27be04749 100644
--- a/make/config/jogl/gl-impl-CustomCCode-gles2.c
+++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c
@@ -14,3 +14,12 @@ Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec
   return (jlong) (intptr_t) _res;
 }
 
+/*   Java->C glue code:
+ *   Java package: com.sun.opengl.impl.es2.GLES2Impl
+ *    Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity);
+ *     C function: jobject newDirectByteBuffer(jlong addr, jint capacity);
+ */
+JNIEXPORT jobject JNICALL
+Java_com_sun_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) {
+  return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity);
+}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
index 79df64d9f..b2d61e596 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2.java
@@ -396,8 +396,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
   ARBVBOKey key = new ARBVBOKey(addr, sz);
   ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
   if (_res == null) {
-    _res = InternalBufferUtils.newDirectByteBuffer(addr, sz);
-    _res.order(ByteOrder.nativeOrder());
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
     arbVBOCache.put(key, _res);
   }
   _res.position(0);
@@ -407,6 +407,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
 /** 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, int capacity);
+
   /** Dummy implementation for the ES 2.0 function: <br> <code> void {@native glShaderBinary}(GLint n, const GLuint *  shaders, GLenum binaryformat, const void *  binary, GLint length); </code>  <br> Always throws a GLException!  */
   public void glShaderBinary(int n, java.nio.IntBuffer shaders, int binaryformat, java.nio.Buffer binary, int length) {
     throw new GLException("Method \"glShaderBinary\" not available");
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index 9ddbf06fb..0575eb1a2 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -155,7 +155,7 @@
     if(count<=0) {
         throw new GLException("Method \"glShaderSource\" called with invalid length of source: "+count);
     }
-    IntBuffer length = BufferUtil.newIntBuffer(count);
+    IntBuffer length = InternalBufferUtil.newIntBuffer(count);
     for(int i=0; i<count; i++) {
         length.put(source[i].length());
     }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
index 7edd95aea..4668bd7ff 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
@@ -336,8 +336,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
   ARBVBOKey key = new ARBVBOKey(addr, sz);
   ByteBuffer _res = (ByteBuffer) arbVBOCache.get(key);
   if (_res == null) {
-    _res = InternalBufferUtils.newDirectByteBuffer(addr, sz);
-    _res.order(ByteOrder.nativeOrder());
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
     arbVBOCache.put(key, _res);
   }
   _res.position(0);
@@ -347,6 +347,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
 /** 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, int capacity);
+
   /** Dummy implementation for the ES 2.0 function: <br> <code> void {@native glShaderBinary}(GLint n, const GLuint *  shaders, GLenum binaryformat, const void *  binary, GLint length); </code>  <br> Always throws a GLException!  */
   public void glShaderBinary(int n, java.nio.IntBuffer shaders, int binaryformat, java.nio.Buffer binary, int length) {
     throw new GLException("Method \"glShaderBinary\" not available");
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index a10f8c5e0..3af0864cd 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -291,8 +291,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
   ARBVBOKey key = new ARBVBOKey(addr, sz);
   java.nio.ByteBuffer _res = (java.nio.ByteBuffer) arbVBOCache.get(key);
   if (_res == null) {
-    _res = InternalBufferUtils.newDirectByteBuffer(addr, sz);
-    BufferUtil.nativeOrder(_res);
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
     arbVBOCache.put(key, _res);
   }
   _res.position(0);
@@ -302,6 +302,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
 /** 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, int capacity);
+
   public final String toString() {
       return getClass().getName();
   }
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
index face06292..bf94eed43 100755
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles2.java
@@ -301,8 +301,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
   ARBVBOKey key = new ARBVBOKey(addr, sz);
   java.nio.ByteBuffer _res = (java.nio.ByteBuffer) arbVBOCache.get(key);
   if (_res == null) {
-    _res = InternalBufferUtils.newDirectByteBuffer(addr, sz);
-    BufferUtil.nativeOrder(_res);
+    _res = newDirectByteBuffer(addr, sz);
+    InternalBufferUtil.nativeOrder(_res);
     arbVBOCache.put(key, _res);
   }
   _res.position(0);
@@ -312,6 +312,8 @@ public java.nio.ByteBuffer glMapBuffer(int target, int access) {
 /** 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, int capacity);
+
 public void glClearDepth(double depth) {
     glClearDepthf((float)depth); 
 }
diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java
index b8c9685f6..94a859ba5 100755
--- a/make/config/jogl/glu-CustomJavaCode-base.java
+++ b/make/config/jogl/glu-CustomJavaCode-base.java
@@ -1363,21 +1363,21 @@ public void gluLookAt(double eyeX, double eyeY, double eyeZ, double centerX, dou
  * <P> Accepts the outgoing window coordinates as a single array.
  */
 public boolean gluProject(double objX, double objY, double objZ, double[] model, int model_offset, double[] proj, int proj_offset, int[] view, int view_offset, double[] winPos, int winPos_offset) {
-  return project.gluProject((float)objX, (float)objY, (float)objZ, BufferUtil.getFloatArray(model), model_offset, BufferUtil.getFloatArray(proj), proj_offset, view, view_offset, BufferUtil.getFloatArray(winPos), winPos_offset);
+  return project.gluProject((float)objX, (float)objY, (float)objZ, InternalBufferUtil.getFloatArray(model), model_offset, InternalBufferUtil.getFloatArray(proj), proj_offset, view, view_offset, InternalBufferUtil.getFloatArray(winPos), winPos_offset);
 }
 
 /** Interface to C language function: <br> <code> GLint gluUnProject(GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ); </code>
  * <P> Accepts the outgoing object coordinates (a 3-vector) as a single array.
  */
 public boolean gluUnProject(double winX, double winY, double winZ, double[] model, int model_offset, double[] proj, int proj_offset, int[] view, int view_offset, double[] objPos, int objPos_offset) {
-  return project.gluUnProject((float)winX, (float)winY, (float)winZ, BufferUtil.getFloatArray(model), model_offset, BufferUtil.getFloatArray(proj), proj_offset, view, view_offset, BufferUtil.getFloatArray(objPos), objPos_offset);
+  return project.gluUnProject((float)winX, (float)winY, (float)winZ, InternalBufferUtil.getFloatArray(model), model_offset, InternalBufferUtil.getFloatArray(proj), proj_offset, view, view_offset, InternalBufferUtil.getFloatArray(objPos), objPos_offset);
 }
 
 /** Interface to C language function: <br> <code> GLint gluUnProject4(GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *  model, const GLdouble *  proj, const GLint *  view, GLdouble nearVal, GLdouble farVal, GLdouble *  objX, GLdouble *  objY, GLdouble *  objZ, GLdouble *  objW); </code>
  * <P> Accepts the outgoing object coordinates (a 4-vector) as a single array.
  */
 public boolean gluUnProject4(double winX, double winY, double winZ, double clipW, double[] model, int model_offset, double[] proj, int proj_offset, int[] view, int view_offset, double nearVal, double farVal, double[] objPos, int objPos_offset) {
-  return project.gluUnProject4((float)winX, (float)winY, (float)winZ, (float)clipW, BufferUtil.getFloatArray(model), model_offset, BufferUtil.getFloatArray(proj), proj_offset, view, view_offset, (float)nearVal, (float)farVal, BufferUtil.getFloatArray(objPos), objPos_offset);
+  return project.gluUnProject4((float)winX, (float)winY, (float)winZ, (float)clipW, InternalBufferUtil.getFloatArray(model), model_offset, InternalBufferUtil.getFloatArray(proj), proj_offset, view, view_offset, (float)nearVal, (float)farVal, InternalBufferUtil.getFloatArray(objPos), objPos_offset);
 }
 
 public void gluPickMatrix(double x, double y, double delX, double delY, int[] viewport, int viewport_offset) {
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2.java b/make/config/jogl/glu-CustomJavaCode-gl2.java
index aedacf3dd..623d08e8c 100644
--- a/make/config/jogl/glu-CustomJavaCode-gl2.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2.java
@@ -218,13 +218,13 @@ private final ByteBuffer copyToByteBuffer(Buffer buf) {
     if (buf.position() == 0) {
       return (ByteBuffer) buf;
     }
-    return BufferUtil.copyByteBuffer((ByteBuffer) buf);
+    return InternalBufferUtil.copyByteBuffer((ByteBuffer) buf);
   } else if (buf instanceof ShortBuffer) {
-    return BufferUtil.copyShortBufferAsByteBuffer((ShortBuffer) buf);
+    return InternalBufferUtil.copyShortBufferAsByteBuffer((ShortBuffer) buf);
   } else if (buf instanceof IntBuffer) {
-    return BufferUtil.copyIntBufferAsByteBuffer((IntBuffer) buf);
+    return InternalBufferUtil.copyIntBufferAsByteBuffer((IntBuffer) buf);
   } else if (buf instanceof FloatBuffer) {
-    return BufferUtil.copyFloatBufferAsByteBuffer((FloatBuffer) buf);
+    return InternalBufferUtil.copyFloatBufferAsByteBuffer((FloatBuffer) buf);
   } else {
     throw new IllegalArgumentException("Unsupported buffer type (must be one of byte, short, int, or float)");
   }
@@ -239,11 +239,11 @@ private final int gluScaleImageJava( int format, int widthin, int heightin,
   if( dataout instanceof ByteBuffer ) {
     out = (ByteBuffer)dataout;
   } else if( dataout instanceof ShortBuffer ) {
-    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_SHORT);
+    out = InternalBufferUtil.newByteBuffer(dataout.remaining() * InternalBufferUtil.SIZEOF_SHORT);
   } else if ( dataout instanceof IntBuffer ) {
-    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_INT);
+    out = InternalBufferUtil.newByteBuffer(dataout.remaining() * InternalBufferUtil.SIZEOF_INT);
   } else if ( dataout instanceof FloatBuffer ) {
-    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_FLOAT);
+    out = InternalBufferUtil.newByteBuffer(dataout.remaining() * InternalBufferUtil.SIZEOF_FLOAT);
   } else {
     throw new IllegalArgumentException("Unsupported destination buffer type (must be byte, short, int, or float)");
   }
diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
index 074ff99b4..8afc28c15 100755
--- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java
+++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java
@@ -99,13 +99,13 @@ private final java.nio.ByteBuffer copyToByteBuffer(java.nio.Buffer buf) {
     if (buf.position() == 0) {
       return (java.nio.ByteBuffer) buf;
     }
-    return BufferUtil.copyByteBuffer((java.nio.ByteBuffer) buf);
+    return InternalBufferUtil.copyByteBuffer((java.nio.ByteBuffer) buf);
   } else if (buf instanceof java.nio.ShortBuffer) {
-    return BufferUtil.copyShortBufferAsByteBuffer((java.nio.ShortBuffer) buf);
+    return InternalBufferUtil.copyShortBufferAsByteBuffer((java.nio.ShortBuffer) buf);
   } else if (buf instanceof java.nio.IntBuffer) {
-    return BufferUtil.copyIntBufferAsByteBuffer((java.nio.IntBuffer) buf);
+    return InternalBufferUtil.copyIntBufferAsByteBuffer((java.nio.IntBuffer) buf);
   } else if (buf instanceof java.nio.FloatBuffer) {
-    return BufferUtil.copyFloatBufferAsByteBuffer((java.nio.FloatBuffer) buf);
+    return InternalBufferUtil.copyFloatBufferAsByteBuffer((java.nio.FloatBuffer) buf);
   } else {
     throw new IllegalArgumentException("Unsupported buffer type (must be one of byte, short, int, or float)");
   }
@@ -124,11 +124,11 @@ public final int gluScaleImage( int format, int widthin, int heightin,
   if( dataout instanceof java.nio.ByteBuffer ) {
     out = (java.nio.ByteBuffer)dataout;
   } else if( dataout instanceof java.nio.ShortBuffer ) {
-    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_SHORT);
+    out = InternalBufferUtil.newByteBuffer(dataout.remaining() * InternalBufferUtil.SIZEOF_SHORT);
   } else if ( dataout instanceof java.nio.IntBuffer ) {
-    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_INT);
+    out = InternalBufferUtil.newByteBuffer(dataout.remaining() * InternalBufferUtil.SIZEOF_INT);
   } else if ( dataout instanceof java.nio.FloatBuffer ) {
-    out = BufferUtil.newByteBuffer(dataout.remaining() * BufferUtil.SIZEOF_FLOAT);
+    out = InternalBufferUtil.newByteBuffer(dataout.remaining() * InternalBufferUtil.SIZEOF_FLOAT);
   } else {
     throw new IllegalArgumentException("Unsupported destination buffer type (must be byte, short, int, or float)");
   }
diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg
index a21cfe9c6..3b5a1160a 100644
--- a/make/config/jogl/glu-common.cfg
+++ b/make/config/jogl/glu-common.cfg
@@ -9,10 +9,7 @@ TagNativeBinding true
 #
 Import java.nio.*
 Import javax.media.opengl.*
-Import javax.media.opengl.sub.*
-Import javax.media.opengl.sub.fixed.*
 Import javax.media.opengl.glu.*
-Import javax.media.opengl.util.*
 Import com.sun.opengl.impl.*
 Import com.sun.opengl.impl.glu.*
 Import com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl
diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg
index 564dfc6a7..d69a3df3b 100755
--- a/make/config/jogl/glxext.cfg
+++ b/make/config/jogl/glxext.cfg
@@ -9,7 +9,7 @@ JavaClass GLXExt
 ImplPackage com.sun.opengl.impl.x11.glx
 ImplJavaClass GLXExtImpl
 
-ExtendedInterfaceSymbols ../build/jogl/temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java
+ExtendedInterfaceSymbols ../build-temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java
 Include gl-common-gl2.cfg
 Include gl-desktop.cfg